Skip to content

Commit 146f383

Browse files
authored
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
1 parent 5e60780 commit 146f383

File tree

6 files changed

+9
-33
lines changed

6 files changed

+9
-33
lines changed

.editorconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,10 @@ end_of_line = lf
293293
[*.{cmd,bat}]
294294
end_of_line = crlf
295295

296+
# Package manifests
297+
[{*.spec,control}]
298+
end_of_line = lf
299+
296300
# YAML files
297301
[*.{yml,yaml}]
298302
indent_size = 2

.gitattributes

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,12 @@
33
*.png binary
44
*.ico binary
55
*.sh text eol=lf
6+
*.spec text eol=lf
7+
control text eol=lf
68
*.bat text eol=crlf
79
*.cmd text eol=crlf
810
*.ps1 text eol=crlf
911
*.json text
1012

1113
.gitattributes export-ignore
12-
.gitignore export-ignore
14+
.gitignore export-ignore

build/resources/rpm/SPECS/build.spec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ Summary: Open-source & Free Git Gui Client
55
License: MIT
66
URL: https://sourcegit-scm.github.io/
77
Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
8-
Requires: (libX11 or libX11-6)
9-
Requires: (libSM or libSM6)
8+
Requires: libX11.so.6()(%{__isa_bits}bit)
9+
Requires: libSM.so.6()(%{__isa_bits}bit)
1010

1111
%define _build_id_links none
1212

build/scripts/package.linux.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ set -o
55
set -u
66
set pipefail
77

8-
if [[ -z "$VERSION" ]]; then
9-
echo "Provide the version as environment variable VERSION"
10-
exit 1
11-
fi
12-
13-
if [[ -z "$RUNTIME" ]]; then
14-
echo "Provide the runtime as environment variable RUNTIME"
15-
exit 1
16-
fi
17-
188
arch=
199
appimage_arch=
2010
target=

build/scripts/package.osx-app.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ set -o
55
set -u
66
set pipefail
77

8-
if [[ -z "$VERSION" ]]; then
9-
echo "Provide the version as environment variable VERSION"
10-
exit 1
11-
fi
12-
13-
if [[ -z "$RUNTIME" ]]; then
14-
echo "Provide the runtime as environment variable RUNTIME"
15-
exit 1
16-
fi
17-
188
cd build
199

2010
mkdir -p SourceGit.app/Contents/Resources

build/scripts/package.windows-portable.sh

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,6 @@ set -o
55
set -u
66
set pipefail
77

8-
if [[ -z "$VERSION" ]]; then
9-
echo "Provide the version as environment variable VERSION"
10-
exit 1
11-
fi
12-
13-
if [[ -z "$RUNTIME" ]]; then
14-
echo "Provide the runtime as environment variable RUNTIME"
15-
exit 1
16-
fi
17-
188
cd build
199

2010
rm -rf SourceGit/*.pdb

0 commit comments

Comments
 (0)