fedora-release fedora-release.spec, 1.59, 1.60 RPM-GPG-KEY-fedora, 1.1.1.1, NONE RPM-GPG-KEY-fedora-test, 1.1.1.1, NONE

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4337

Modified Files:
	fedora-release.spec 
Removed Files:
	RPM-GPG-KEY-fedora RPM-GPG-KEY-fedora-test 
Log Message:
- Make fedora-release arch specific
- Package up the ia64 key as the first secondary arch
- Install keys based on arch




Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -r1.59 -r1.60
--- fedora-release.spec	11 Jun 2008 18:49:47 -0000	1.59
+++ fedora-release.spec	11 Jun 2008 19:22:25 -0000	1.60
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9.90
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -17,7 +17,6 @@
 # upgrades, and just because we always want the release notes available
 # instead of explicitly asked for
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch:	noarch
 
 %description
 Fedora release files such as yum configs and various /etc/ files that
@@ -41,9 +40,16 @@
 ln -s fedora-release $RPM_BUILD_ROOT/etc/system-release
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-for file in RPM-GPG-KEY* ; do
-	install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
-done
+
+# Install secondary arch specific keys here
+%ifarch ia64
+    install -m 644 RPM-GPG-KEY-fedora-ia64 $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+    install -m 644 RPM-GPG-KEY-fedora-test-ia64 $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-primary
+# Assume any other arch should just get the primary keys
+%else
+    install -m 644 RPM-GPG-KEY-fedora-primary $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+    install -m 644 RPM-GPG-KEY-fedora-test-primary $RPM_BUILD_ROOT/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-primary
+%endif
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in fedora*repo ; do
@@ -86,6 +92,11 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jun 11 2008 Jesse Keating <jkeating at redhat.com> - 9.90-2
+- Make fedora-release arch specific
+- Package up the ia64 key as the first secondary arch
+- Install keys based on arch
+
 * Mon Mar 31 2008 Jesse Keating <jkeating at redhat.com> - 9.90-1
 - Update for Fedora 10 rawhide.
 


--- RPM-GPG-KEY-fedora DELETED ---


--- RPM-GPG-KEY-fedora-test DELETED ---