mirror of
https://github.com/sourcegit-scm/sourcegit.git
synced 2024-12-24 20:57:19 -08:00
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 in211c263
, 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 in6461765
This commit is contained in:
parent
5e60780c9f
commit
146f383aae
6 changed files with 9 additions and 33 deletions
|
@ -293,6 +293,10 @@ end_of_line = lf
|
||||||
[*.{cmd,bat}]
|
[*.{cmd,bat}]
|
||||||
end_of_line = crlf
|
end_of_line = crlf
|
||||||
|
|
||||||
|
# Package manifests
|
||||||
|
[{*.spec,control}]
|
||||||
|
end_of_line = lf
|
||||||
|
|
||||||
# YAML files
|
# YAML files
|
||||||
[*.{yml,yaml}]
|
[*.{yml,yaml}]
|
||||||
indent_size = 2
|
indent_size = 2
|
||||||
|
|
2
.gitattributes
vendored
2
.gitattributes
vendored
|
@ -3,6 +3,8 @@
|
||||||
*.png binary
|
*.png binary
|
||||||
*.ico binary
|
*.ico binary
|
||||||
*.sh text eol=lf
|
*.sh text eol=lf
|
||||||
|
*.spec text eol=lf
|
||||||
|
control text eol=lf
|
||||||
*.bat text eol=crlf
|
*.bat text eol=crlf
|
||||||
*.cmd text eol=crlf
|
*.cmd text eol=crlf
|
||||||
*.ps1 text eol=crlf
|
*.ps1 text eol=crlf
|
||||||
|
|
|
@ -5,8 +5,8 @@ Summary: Open-source & Free Git Gui Client
|
||||||
License: MIT
|
License: MIT
|
||||||
URL: https://sourcegit-scm.github.io/
|
URL: https://sourcegit-scm.github.io/
|
||||||
Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
|
Source: https://github.com/sourcegit-scm/sourcegit/archive/refs/tags/v%_version.tar.gz
|
||||||
Requires: (libX11 or libX11-6)
|
Requires: libX11.so.6()(%{__isa_bits}bit)
|
||||||
Requires: (libSM or libSM6)
|
Requires: libSM.so.6()(%{__isa_bits}bit)
|
||||||
|
|
||||||
%define _build_id_links none
|
%define _build_id_links none
|
||||||
|
|
||||||
|
|
|
@ -5,16 +5,6 @@ set -o
|
||||||
set -u
|
set -u
|
||||||
set pipefail
|
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=
|
arch=
|
||||||
appimage_arch=
|
appimage_arch=
|
||||||
target=
|
target=
|
||||||
|
|
|
@ -5,16 +5,6 @@ set -o
|
||||||
set -u
|
set -u
|
||||||
set pipefail
|
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
|
cd build
|
||||||
|
|
||||||
mkdir -p SourceGit.app/Contents/Resources
|
mkdir -p SourceGit.app/Contents/Resources
|
||||||
|
|
|
@ -5,16 +5,6 @@ set -o
|
||||||
set -u
|
set -u
|
||||||
set pipefail
|
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
|
cd build
|
||||||
|
|
||||||
rm -rf SourceGit/*.pdb
|
rm -rf SourceGit/*.pdb
|
||||||
|
|
Loading…
Reference in a new issue