Accepting request 669010 from Base:System

- 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/request/show/669010
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-build-key?expand=0&rev=37
This commit is contained in:
Dominique Leuenberger 2019-01-28 19:49:42 +00:00 committed by Git OBS Bridge
commit bc65792f7a
2 changed files with 10 additions and 3 deletions

View File

@ -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

View File

@ -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,12 +87,13 @@ 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
%{keydir}/gpg-pubkey-50a3dd1c-50f35137.asc
%{keydir}/gpg-pubkey-39db7c82-5847eb1f.asc
%{keydir}/gpg-pubkey-307e3d54-5aaa90a5.asc
%{keydir}/suse_ptf_key.asc
%changelog