From 3b722e367c1e184a3f2ad9381c56b238f0321abe636a4e674a297fca7e88a078 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 5 Jul 2021 10:30:11 +0000 Subject: [PATCH] Accepting request 903938 from home:dirkmueller:branches:Base:System - remove dumpsigs for SLE12+ (rpm 4.x) (bsc#1186827) OBS-URL: https://build.opensuse.org/request/show/903938 OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-build-key?expand=0&rev=35 --- suse-build-key.changes | 5 +++++ suse-build-key.spec | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/suse-build-key.changes b/suse-build-key.changes index 25c2727..10692a3 100644 --- a/suse-build-key.changes +++ b/suse-build-key.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 11 09:49:11 UTC 2021 - Dirk Müller + +- remove dumpsigs for SLE12+ (rpm 4.x) (bsc#1186827) + ------------------------------------------------------------------- Mon Sep 21 08:30:03 UTC 2020 - Marcus Meissner diff --git a/suse-build-key.spec b/suse-build-key.spec index 73cebaa..e331f6a 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -91,7 +91,9 @@ for i in %sources; do ;; esac done +%if 0%{?suse_version} && 0%{?suse_version} < 1120 install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg +%endif install -d -m 755 $RPM_BUILD_ROOT%{containerkeydir}/ install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{containerkeydir}/suse-container-key.asc @@ -102,7 +104,9 @@ install -c -m 644 %{SOURCE3} $RPM_BUILD_ROOT%{containerkeydir}/suse-container-ke %attr(755,root,root) %dir %{_prefix}/lib/rpm/gnupg %attr(755,root,root) %dir %{keydir} %attr(755,root,root) %dir %{containerkeydir} +%if 0%{?suse_version} && 0%{?suse_version} < 1120 %attr(755,root,root) %{_prefix}/lib/rpm/gnupg/dumpsigs +%endif %{keydir}/gpg-pubkey-50a3dd1c-50f35137.asc %{keydir}/gpg-pubkey-39db7c82-5f68629b.asc %{keydir}/gpg-pubkey-307e3d54-5aaa90a5.asc