From 146f383aae214bec7877ac9d803ebd6efcf60e1a Mon Sep 17 00:00:00 2001
From: aikawayataro <aikawayataro@protonmail.com>
Date: Tue, 12 Nov 2024 11:50:16 +0000
Subject: [PATCH] enhance: depend on SO in rpm package  (#688)

* enhance: ensure LF line endings used with package manifests
* enhance: depend on shared object instead of package

Back in 211c263, I changed the dependencies to depend on package instead of shared object. This worked well, but introduced some problems for distros other than Fedora (81f76f0). I did this because of problems with the arm64 package, but now I think `__isa_bits` is a reasonable workaround.

* refactor: remove pointless variable checks

`set -u` was introduced in 6461765
---
 .editorconfig                             |  4 ++++
 .gitattributes                            |  4 +++-
 build/resources/rpm/SPECS/build.spec      |  4 ++--
 build/scripts/package.linux.sh            | 10 ----------
 build/scripts/package.osx-app.sh          | 10 ----------
 build/scripts/package.windows-portable.sh | 10 ----------
 6 files changed, 9 insertions(+), 33 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 3ad9d05b..83b15884 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -293,6 +293,10 @@ end_of_line = lf
 [*.{cmd,bat}]
 end_of_line = crlf
 
+# Package manifests
+[{*.spec,control}]
+end_of_line = lf
+
 # YAML files
 [*.{yml,yaml}]
 indent_size = 2
diff --git a/.gitattributes b/.gitattributes
index 7410eb08..bd1dfea9 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -3,10 +3,12 @@
 *.png      binary
 *.ico      binary
 *.sh       text eol=lf
+*.spec     text eol=lf
+control    text eol=lf
 *.bat      text eol=crlf
 *.cmd      text eol=crlf
 *.ps1      text eol=crlf
 *.json     text
 
 .gitattributes export-ignore
-.gitignore     export-ignore
\ No newline at end of file
+.gitignore     export-ignore
diff --git a/build/resources/rpm/SPECS/build.spec b/build/resources/rpm/SPECS/build.spec
index 9dda5f96..d31b6587 100644
--- a/build/resources/rpm/SPECS/build.spec
+++ b/build/resources/rpm/SPECS/build.spec
@@ -5,8 +5,8 @@ Summary: Open-source & Free Git Gui Client
 License: MIT
 URL: https://sourcegit-scm.github.io/
 Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
-Requires: (libX11 or libX11-6)
-Requires: (libSM or libSM6)
+Requires: libX11.so.6()(%{__isa_bits}bit)
+Requires: libSM.so.6()(%{__isa_bits}bit)
 
 %define _build_id_links none
 
diff --git a/build/scripts/package.linux.sh b/build/scripts/package.linux.sh
index 5ffd5a27..5abb058b 100755
--- a/build/scripts/package.linux.sh
+++ b/build/scripts/package.linux.sh
@@ -5,16 +5,6 @@ set -o
 set -u
 set pipefail
 
-if [[ -z "$VERSION" ]]; then
-    echo "Provide the version as environment variable VERSION"
-    exit 1
-fi
-
-if [[ -z "$RUNTIME" ]]; then
-    echo "Provide the runtime as environment variable RUNTIME"
-    exit 1
-fi
-
 arch=
 appimage_arch=
 target=
diff --git a/build/scripts/package.osx-app.sh b/build/scripts/package.osx-app.sh
index 4a50a860..2d43e24a 100755
--- a/build/scripts/package.osx-app.sh
+++ b/build/scripts/package.osx-app.sh
@@ -5,16 +5,6 @@ set -o
 set -u
 set pipefail
 
-if [[ -z "$VERSION" ]]; then
-    echo "Provide the version as environment variable VERSION"
-    exit 1
-fi
-
-if [[ -z "$RUNTIME" ]]; then
-    echo "Provide the runtime as environment variable RUNTIME"
-    exit 1
-fi
-
 cd build
 
 mkdir -p SourceGit.app/Contents/Resources
diff --git a/build/scripts/package.windows-portable.sh b/build/scripts/package.windows-portable.sh
index 9ba29216..6bd3879b 100755
--- a/build/scripts/package.windows-portable.sh
+++ b/build/scripts/package.windows-portable.sh
@@ -5,16 +5,6 @@ set -o
 set -u
 set pipefail
 
-if [[ -z "$VERSION" ]]; then
-    echo "Provide the version as environment variable VERSION"
-    exit 1
-fi
-
-if [[ -z "$RUNTIME" ]]; then
-    echo "Provide the runtime as environment variable RUNTIME"
-    exit 1
-fi
-
 cd build
 
 rm -rf SourceGit/*.pdb