rpm/suse-build-key
SHA256
1
0
Fork 0
forked from pool/suse-build-key
Code Pull Requests Activity

Accepting request 1190502 from Base:System

Browse Source 
- ensure key2rpmname is called using bash.

This fixes build on SLE15SP7. (forwarded request 1190501 from epaolantonio)

OBS-URL: https://build.opensuse.org/request/show/1190502
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-build-key?expand=0&rev=46
This commit is contained in:
Dominique Leuenberger 2024-07-31 11:30:06 +00:00 committed by Git OBS Bridge
commit 5d44700bd5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
suse-build-key.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Jul 30 14:33:40 UTC 2024 - Eugenio Paolantonio <eugenio.paolantonio@suse.com>
- ensure key2rpmname is called using bash.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 19 08:47:17 UTC 2024 - Marcus Meissner <meissner@suse.com> Fri Jul 19 08:47:17 UTC 2024 - Marcus Meissner <meissner@suse.com>

3
suse-build-key.spec
View File

@ -123,7 +123,7 @@ mkdir -p $RPM_BUILD_ROOT%{keydir}
%if %{with build_key_include_prjkey} %if %{with build_key_include_prjkey}
if [ -e "%_sourcedir/_pubkey" ]; then if [ -e "%_sourcedir/_pubkey" ]; then
name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc" name="$(bash %{SOURCE1000} %_sourcedir/_pubkey).asc"
if [ ! -e "%_sourcedir/$name" ]; then if [ ! -e "%_sourcedir/$name" ]; then
install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name" install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name"
fi fi
@ -138,7 +138,6 @@ for i in %sources; do
esac esac
done done
%if 0%{?suse_version} && 0%{?suse_version} < 1120 %if 0%{?suse_version} && 0%{?suse_version} < 1120
install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg
%endif %endif