rpms/fedora-release/F-9 fedora-release.spec, 1.69, 1.70 sources, 1.57, 1.58

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2038

Modified Files:
	fedora-release.spec sources 
Log Message:
* Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3
- Add ia64 key
- Fix config file markings
- Stop using download.fedora.redhat.com in favor of download.fedoraproject.org
- Reference GPG keys by arch



Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-9/fedora-release.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- fedora-release.spec	6 May 2008 17:10:32 -0000	1.69
+++ fedora-release.spec	25 Jun 2008 21:53:52 -0000	1.70
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	9
-Release:	2
+Release:	3
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -40,9 +40,20 @@
 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
+
+install -m 644 RPM-GPG-KEY* $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+
+# Install all the keys, link the primary keys to primary arch files
+# and to compat generic location
+pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
+for arch in i386 x86_64 ppc ppc64
+  do
+  ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora-$arch
+  ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test-$arch
 done
+ln -s RPM-GPG-KEY-fedora-primary RPM-GPG-KEY-fedora
+ln -s RPM-GPG-KEY-fedora-test-primary RPM-GPG-KEY-fedora-test
+popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in fedora*repo ; do
@@ -73,7 +84,7 @@
 %config %attr(0644,root,root) /etc/fedora-release
 /etc/redhat-release
 /etc/system-release
-/etc/system-release-cpe
+%config %attr(0644,root,root) /etc/system-release-cpe
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/*
 %config(noreplace) %attr(0644,root,root) /etc/issue
@@ -85,6 +96,12 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jun 25 2008 Jesse Keating <jkeating at redhat.com> - 9-3
+- Add ia64 key
+- Fix config file markings
+- Stop using download.fedora.redhat.com in favor of download.fedoraproject.org
+- Reference GPG keys by arch
+
 * Tue May 06 2008 Jesse Keating <jkeating at redhat.com> - 9-2
 - Update compose files with changes needed during release candidates
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/F-9/sources,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sources	6 May 2008 17:10:32 -0000	1.57
+++ sources	25 Jun 2008 21:53:52 -0000	1.58
@@ -1 +1 @@
-a542322989425943d86fa225ed6454e8  fedora-release-9.tar.gz
+d3037f3460e9ce7288263cf8f2b90053  fedora-release-9.tar.gz