rpms/fedora-release/devel .cvsignore, 1.32, 1.33 fedora-release.spec, 1.66, 1.67 sources, 1.54, 1.55

[Jesse Keating (jkeating)]

Author: jkeating

Update of /cvs/pkgs/rpms/fedora-release/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv25189

Modified Files:
	.cvsignore fedora-release.spec sources 
Log Message:
New release, add secondary arch key (ia64), lay out keys differently



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore	31 Mar 2008 12:28:38 -0000	1.32
+++ .cvsignore	24 Jun 2008 14:53:31 -0000	1.33
@@ -1 +1 @@
-fedora-release-9.90.tar.gz
+fedora-release-9.90.1.tar.gz


Index: fedora-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- fedora-release.spec	31 Mar 2008 12:28:38 -0000	1.66
+++ fedora-release.spec	24 Jun 2008 14:53:31 -0000	1.67
@@ -3,7 +3,7 @@
 
 Summary:	Fedora release files
 Name:		fedora-release
-Version:	9.90
+Version:	9.90.1
 Release:	1
 License:	GPLv2
 Group:		System Environment/Base
@@ -41,9 +41,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
@@ -74,7 +85,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
@@ -86,6 +97,11 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jun 11 2008 Jesse Keating <jkeating at redhat.com> - 9.90-2
+- Package up the ia64 key as the first secondary arch
+- Mark config files correctly
+- Stop using download.fedora.redhat.com and use download.fedoraproject.org instead
+
 * Mon Mar 31 2008 Jesse Keating <jkeating at redhat.com> - 9.90-1
 - Update for Fedora 10 rawhide.
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fedora-release/devel/sources,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -r1.54 -r1.55
--- sources	31 Mar 2008 12:28:38 -0000	1.54
+++ sources	24 Jun 2008 14:53:31 -0000	1.55
@@ -1 +1 @@
-f13119f8b18708b127b06f44e234f3aa  fedora-release-9.90.tar.gz
+13288e8f0f31a2d6b1dfcf2d6a832037  fedora-release-9.90.1.tar.gz