From cd81c905412902c080ac1a4ec2d6a1cbc888799b48db3606d53b99cce420dc01 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Mon, 22 Oct 2012 20:10:31 +0000 Subject: [PATCH] Accepting request 138962 from Base:System - export keys to single files in /usr/lib/rpm/gnupg/keys (forwarded request 138949 from oertel) OBS-URL: https://build.opensuse.org/request/show/138962 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/suse-build-key?expand=0&rev=27 --- suse-build-key.changes | 5 +++++ suse-build-key.spec | 20 +++++++++++++------- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/suse-build-key.changes b/suse-build-key.changes index fdf4c3e..22aeb6f 100644 --- a/suse-build-key.changes +++ b/suse-build-key.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Oct 21 23:03:01 CEST 2012 - ro@suse.de + +- export keys to single files in /usr/lib/rpm/gnupg/keys + ------------------------------------------------------------------- Tue May 4 16:11:41 CEST 2010 - ro@suse.de diff --git a/suse-build-key.spec b/suse-build-key.spec index 5e35f04..b0f5404 100644 --- a/suse-build-key.spec +++ b/suse-build-key.spec @@ -1,7 +1,7 @@ # -# spec file for package suse-build-key (Version 1.0) +# spec file for package suse-build-key # -# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,19 +15,17 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: suse-build-key BuildRequires: gpg -License: GPL-2.0+ -Group: System/Packages Provides: build-key Requires: gpg AutoReqProv: off Summary: The public gpg key for rpm package signature verification +License: GPL-2.0+ +Group: System/Packages Version: 1.0 -Release: 909 +Release: 0 Source0: suse-build-key.gpg Source1: dumpsigs BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -59,6 +57,13 @@ rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT/usr/lib/rpm/gnupg install %{SOURCE0} $RPM_BUILD_ROOT/%{susering} install -m 755 %{SOURCE1} $RPM_BUILD_ROOT/usr/lib/rpm/gnupg +install -d $RPM_BUILD_ROOT%{keydir} +mkdir keys +cd keys +$RPM_BUILD_ROOT/usr/lib/rpm/gnupg/dumpsigs $RPM_BUILD_ROOT/%{susering} +cd .. +cp -a keys $RPM_BUILD_ROOT/usr/lib/rpm/gnupg + touch $RPM_BUILD_ROOT/%{pubring} touch $RPM_BUILD_ROOT/%{pubring}~ @@ -66,6 +71,7 @@ touch $RPM_BUILD_ROOT/%{pubring}~ %defattr(644,root,root) %attr(755,root,root) %dir /usr/lib/rpm/gnupg %attr(755,root,root) /usr/lib/rpm/gnupg/dumpsigs +/usr/lib/rpm/gnupg/keys %config /%{susering} %ghost /%{pubring} %ghost /%{pubring}~