From 0071f620daa3f3ba5293d0cafbec186f6125b54236fa1f7078b067f05d3d4e44 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Fri, 11 Jan 2019 15:00:54 +0000 Subject: [PATCH 1/2] - add PTF key to the key directory, so it does not get stripped out when using --exclude-docs (bsc#1044232) OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-build-key?expand=0&rev=30 --- suse-build-key.changes | 6 ++++++ suse-build-key.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/suse-build-key.changes b/suse-build-key.changes index a8792a6..59c2569 100644 --- a/suse-build-key.changes +++ b/suse-build-key.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Fri Jan 11 15:00:10 UTC 2019 - meissner@suse.com + +- add PTF key to the key directory, so it does not get stripped + out when using --exclude-docs (bsc#1044232) + ------------------------------------------------------------------- Wed Mar 28 14:56:15 UTC 2018 - meissner@suse.com diff --git a/suse-build-key.spec b/suse-build-key.spec index 173a679..66faa25 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -1,7 +1,7 @@ # # spec file for package suse-build-key # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -78,7 +78,7 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{keydir} for i in %sources; do case "$i" in - */gpg-pubkey-*.asc) + */gpg-pubkey-*.asc|*/*ptf*.asc) install -m 644 "$i" $RPM_BUILD_ROOT%{keydir} ;; esac @@ -87,7 +87,7 @@ install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg %files %defattr(644,root,root) -%doc security_at_suse_de.asc suse_ptf_key.asc +%doc security_at_suse_de.asc %attr(755,root,root) %dir %{_prefix}/lib/rpm/gnupg %attr(755,root,root) %dir %{keydir} %attr(755,root,root) %{_prefix}/lib/rpm/gnupg/dumpsigs From eb8ac1146f9d5e62cc876098f2bb33ef027f644324477340cbcca45231ed67eb Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Mon, 14 Jan 2019 07:42:42 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Base:System/suse-build-key?expand=0&rev=31 --- suse-build-key.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/suse-build-key.spec b/suse-build-key.spec index 66faa25..a5d78ba 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -94,5 +94,6 @@ install -m 755 %{SOURCE100} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg %{keydir}/gpg-pubkey-50a3dd1c-50f35137.asc %{keydir}/gpg-pubkey-39db7c82-5847eb1f.asc %{keydir}/gpg-pubkey-307e3d54-5aaa90a5.asc +%{keydir}/suse_ptf_key.asc %changelog