Skip to content

enhance: depend on SO in rpm package #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 12, 2024
Merged

enhance: depend on SO in rpm package #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2f0da87
enhance: ensure LF line endings used with package manifests
aikawayataro Nov 12, 2024
0d3caba
enhance: depend on shared object instead of package
aikawayataro Nov 12, 2024
5793620
refactor: remove pointless variable checks
aikawayataro Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .editorconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion .gitattributes
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
.gitignore export-ignore
4 changes: 2 additions & 2 deletions build/resources/rpm/SPECS/build.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
10 changes: 0 additions & 10 deletions build/scripts/package.linux.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
10 changes: 0 additions & 10 deletions build/scripts/package.osx-app.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 0 additions & 10 deletions build/scripts/package.windows-portable.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down