1
0

Accepting request 1189743 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/1189743
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-build-key?expand=0&rev=45
This commit is contained in:
Dominique Leuenberger 2024-07-26 14:16:12 +00:00 committed by Git OBS Bridge
commit 16fdd84901
2 changed files with 16 additions and 6 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jul 19 08:47:17 UTC 2024 - Marcus Meissner <meissner@suse.com>
- make the per-project inclusion optional, default off.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jul 18 12:13:36 UTC 2024 - Marcus Meissner <meissner@suse.com> Thu Jul 18 12:13:36 UTC 2024 - Marcus Meissner <meissner@suse.com>

View File

@ -17,6 +17,7 @@
# needspubkeyforbuild # needspubkeyforbuild
%bcond_with build_key_include_prjkey
Name: suse-build-key Name: suse-build-key
BuildRequires: gpg BuildRequires: gpg
@ -119,6 +120,16 @@ cp %SOURCE99 .
%install %install
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
mkdir -p $RPM_BUILD_ROOT%{keydir} mkdir -p $RPM_BUILD_ROOT%{keydir}
%if %{with build_key_include_prjkey}
if [ -e "%_sourcedir/_pubkey" ]; then
name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc"
if [ ! -e "%_sourcedir/$name" ]; then
install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name"
fi
fi
%endif
for i in %sources; do for i in %sources; do
case "$i" in case "$i" in
*/gpg-pubkey-*.asc|*/*ptf*.asc) */gpg-pubkey-*.asc|*/*ptf*.asc)
@ -127,12 +138,6 @@ for i in %sources; do
esac esac
done done
if [ -e "%_sourcedir/_pubkey" ]; then
name="$(sh %{SOURCE1000} %_sourcedir/_pubkey).asc"
if [ ! -e "%_sourcedir/$name" ]; then
install -D -m 644 %_sourcedir/_pubkey %{buildroot}%keydir/"$name"
fi
fi
%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