From 7f7a844c140891cb24873f3e78648ee56dd39d42 Mon Sep 17 00:00:00 2001
From: jkeating <jkeating>
Date: Jun 11 2008 19:22:25 +0000
Subject: - Make fedora-release arch specific

- Package up the ia64 key as the first secondary arch
- Install keys based on arch

---

diff --git a/RPM-GPG-KEY-fedora b/RPM-GPG-KEY-fedora
deleted file mode 100644
index 17d4ec7..0000000
--- a/RPM-GPG-KEY-fedora
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (GNU/Linux)
-
-mQGiBD+dnTsRBACwnlz4AhctOLlVBAsq+RaU82nb5P3bD1YJJpsAce1Ckd2sBUOJ
-D11NUCqH8c7EctOquOZ5zTcWxHiWWbLyKQwUw2SUvnWa5SSbi8kI8q9MTPsPvhwt
-gMrQMLenMO+nsrxrSaG6XcD+ssfJNxC7NQVCQAj3pvvg9rKi3ygsM7CXHwCghgsq
-X6TOr55HE90DbEsoq3b/jjsD/i8aIZ6urUgrpAkQslcakXdJLKgSdwjRUgVZgvYZ
-b7kAx1iPq0t/AhB3NJw3zW4AAKJohGg3xj5K4V8PJEZrSIpoRYlF43Kqlfu2p5gh
-WT89SP4YAlWPeTqf0+dTYUYz3b144k2ZFOdRuXIRxunoYNAUr9oMrxBXbJ/eY+0U
-QX3pBACYzKizyY4JJgd0zFJmNkcdK9nzcm+btYFnYQo33w5GSE686UNr+9yiXt9t
-mPRvNEbj3u+xoAX8B/5k3aZ5NbUhV64/VcKlUdRIxNlFCG7I9KgxeHWAYwi7yqOG
-XM3T/v6o7GLdQEB0ChFqS7kUlqmwLV+C3QhlrFe/Cuk26i+Q6rQiRmVkb3JhIFBy
-b2plY3QgPGZlZG9yYUByZWRoYXQuY29tPohbBBMRAgAbBQI/nZ07BgsJCAcDAgMV
-AgMDFgIBAh4BAheAAAoJELRCadBPKm/S2PAAnRTlhorITphab+oxAHtbxZF9BVyD
-AJ9WOVaZUG53IWWIAXOGv3j/cmr3lohGBBMRAgAGBQI/nZ22AAoJECGRgM3bQqYO
-R5QAoIp1G+omVktq/snxpmz5UeHjlSYjAKCRr/ea/L7S7ZTxB18cf1TYfad1x4hG
-BBARAgAGBQI/ntjgAAoJECnVuiSN9W0FUSUAoJnrone4J0o1HMkRz+6g9KVuO2Fy
-AJ0XyebOzVmI9U5OyOfnNmYV0wnQcrkBDQQ/nZ08EAQAugOfLWJbKwMA9vg2mJU5
-94TZU0HRJkx/fqYhx0YxWWRpzplrEyvcDXuYcWi1Hwh0tD86T4fR5GV6joWiWClz
-D+Hwhhb6gcSdeSGlGLlZAvWYtFSHWiv+3LaI9w8Vtczl99Bh2WiMDNDDGw0RQg6Z
-aftldLSe4j1pffpFGQ8SuisAAwUEAKVxqLT7fC5xQ6oclcZ+PhoDlePQ1BiTS7tu
-GM07bFF4nNvY91LL7S31pooz3XbGSWP8jxzSv1Fw35YhSmWGOBOEXluqMbVQGJJ5
-m8fqJOjC0imbfeWgr/T7zLrJeiljDxvX+6TyawyWQngF6v1Hq6FRV0O0bOp9Npt5
-zqCbDGs/iEYEGBECAAYFAj+dnTwACgkQtEJp0E8qb9L//gCcDVYnDegNCOxDn1se
-dDwxw+0h8OcAn1CZHof15QqxnTwEnvwF2QeOI5dn
-=mJAx
------END PGP PUBLIC KEY BLOCK-----
diff --git a/RPM-GPG-KEY-fedora-test b/RPM-GPG-KEY-fedora-test
deleted file mode 100644
index efb8d81..0000000
--- a/RPM-GPG-KEY-fedora-test
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.0.7 (GNU/Linux)
-
-mQGiBD+do/cRBACAF7Gv91v32uUrT4nZe+qKgLl59HmtvmaOzT4lInrF95Sget7p
-2TpnIqh5H0x0VGpdoeNfHvlXCw+aP50mTJv91BYmLfelkTzokqpEU5YpqGOqa5BV
-jelnoK1VKOcXMB28d79Gz9tn7friZN4SnyWbcSIA4C3dHNhsjifIYf0rywCg3y19
-3N6jODa0VSGeeEb4whE2xccD/i/rqk0MQmW6td2Dz2jTBaHxyf7FIcH18YDtwraD
-otBRxqGkTVyFGc1q7ZTrRsbzdjIfxbp2C6GT2VJ5kHuRm9jf7JdW5fOhun+oLimR
-erTlrPmgz8qQRcqUm6fkmUsYufL1u7DdyfxX7jI2ngkbAR+CsZ8Cj5JhBMeAXc/D
-WWhPA/4mzZ70hn1OrGLokzxNr4O7u1+n0thsxGN0qfuTNGIc09UKCoAN42he7Qjs
-kIqiE7gLtLzx8elxVOK19tNcaAiLoqmtxlLQqB03pLy4V0tMP9QcWQETbc67qTd1
-zASiefGjf364j4lQd+X9AqdyhUrnax3UgPD5IxilBp92Cw7Qi7QzRmVkb3JhIFBy
-b2plY3QgKFRlc3QgU29mdHdhcmUpIDxyYXdoaWRlQHJlZGhhdC5jb20+iFsEExEC
-ABsFAj+do/cGCwkIBwMCAxUCAwMWAgECHgECF4AACgkQ2oTL1DDJ7Pgh8QCgqNNs
-b7xdW+UhzyZw+DEAQF6e+q4AmwVus4u9REyd/aigK2RvrdtcsNy0iEYEExECAAYF
-Aj+dpBoACgkQtEJp0E8qb9Ji4QCfanY0CXnRwtBnm8GEMRNqgfGgcc0AnRunlejp
-JRxGPaRsmY/11stYll32iEYEEBECAAYFAj+e2SIACgkQKdW6JI31bQWWNQCfTKcX
-/7lerpwIVHcAILDduz9qxssAn1t46ERJ9EqsxJxSFlN7oBPyNkt6
-=R9He
------END PGP PUBLIC KEY BLOCK-----
diff --git a/fedora-release.spec b/fedora-release.spec
index 0af6258..ed21732 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -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 @@ Requires:	fedora-release-notes >= 8
 # 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/redhat-release
 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 @@ rm -rf $RPM_BUILD_ROOT
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Jun 11 2008 Jesse Keating <jkeating@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@redhat.com> - 9.90-1
 - Update for Fedora 10 rawhide.