Wed Jun 25 21:38:28 UTC 2008

Author: jkeating

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

Modified Files:
      Tag: F-9
	fedora-rawhide.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo fedora.repo 
Added Files:
      Tag: F-9
	RPM-GPG-KEY-fedora-ia64 RPM-GPG-KEY-fedora-primary 
	RPM-GPG-KEY-fedora-test-ia64 RPM-GPG-KEY-fedora-test-primary 
Removed Files:
      Tag: F-9
	RPM-GPG-KEY RPM-GPG-KEY-beta RPM-GPG-KEY-fedora 
	RPM-GPG-KEY-fedora-rawhide RPM-GPG-KEY-fedora-test 
	RPM-GPG-KEY-rawhide 
Log Message:
- Add ia64 key
- Fix config file markings
- Stop using download.fedora.redhat.com in favor of download.fedoraproject.org
- Reference GPG keys by arch
- move the existing Fedora keys to *-primary
- Remove unused keys

--- NEW FILE RPM-GPG-KEY-fedora-ia64 ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBEg8YEkRBACBI439uRaWbaRek2H2YjSN9ROQFQeYyj4tUf1cnwsZ9r8enZIy
VvsSwiDdSzR8wakFGmdjR9O5Lh2V/QHXYaTaTFBtSI4jDnITzkWQxKQaLbOyuBGs
kXeJRXYNhS9toxAh75Q0j2PTjeta0Fzqobg2ehUxSZuWD8c4LNCdjxawzwCglOkb
udBGDZ88EFucQyAZX8g5sbMD/j+LJ/ymm4IDFpFwVTwM3+JQpbyrt9LRH+UIDKRX
9aNrGbdGgVnujbuHLWaAwkpA7wDvvDXAahBIJYMbId2RSfVkKBnTjcgIO6dNeIof
ec0a50DY7wECLLhlszLog/cDL3ZHRSrH0S9o/FydBRlWAI3x84RxAlesPI1UjGOX
drmLA/99p9cZYnlrjKwy2vMP7Qj9aIMPmnthxah8s659UFM859NKC2WUheoMNIYg
hksC7LdyhHs1MCIW1lrlcydrxvJ4Wt5Em2e3IfFutOI4kJEVwGME8QJm3RTYVmD0
nHIJQcI/Zuj48nN62VbSfxafE/2B5JpXmQ/TUHkdpKJSUVemOLQpRmVkb3JhIGlh
NjQgPGZlZG9yYS1pYTY0LWxpc3RAcmVkaGF0LmNvbT6IYAQTEQIAIAUCSDxgSQIb
AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEKijtzH2E8vodKYAnjOR2Q4JdAFW
Y4W6oFvdayD3dOvFAJ92AkZkTQln4rir7Jlbvcv6SXx66LkCDQRIPGBJEAgAq47Z
iOKt1BaVcXoxUKjoKdSam8r0VFCddj3cTdr2e8UpjsJe3Zq7Zg0htbA83T7gpeor
mUJQeuNNLy3QkJOZDdoAqePxXgor6o/3b/7ua9GbMdPTrhQrTmjRUK+SwPHcFBSz
Rm0Bh7UEqvtF9kHnvCdHEIfXMuxKtvZAjGww2KThBlO6FM9umgSbXwVppIDsCEY4
29yp5+TUHsjAWGdXd2KtFWOvdLPPJxOm+TRB4gUT1DbN+OxtLPBV5efbv20mvYvx
g3V93vgcrAgZDKuaho8z0O63/iIAEVR815gC8YmGgCRsFSKdYBbr+TPFw78oayAE
Zf40Q1RYjiD5DimZXwADBQf+L/YLN7MvnZXr00oi2NU0DRX6Z+wn4ZM0XkPYrG12
8ia3bwga26N+Y+lwrLD+RBMyvaD52ojBfUhaq/1xASAOUY62ZLBUw/zw6TKJuUN0
APeypK/mAvdz2eqXNnW5X1EEehPVsQO3mXrrzRcT77GW/GJFe4X+Urusn9MNLrKA
eDJLHymrkmlbgKC8zfr0gaGpcF9HeI42x7PNab/pKsByhlfvSEHt4KtLKmXFc5YU
xxBS3poNLtJq7z/CSbAIGAFas3OiFpFNBEnP4r00iiUJoJx7z5kBoLJVccAjMlZz
IeeO9j+srAgaeNn3GJGWlUz4qkZfqNn+hOwjbHjKgwv4U4hJBBgRAgAJBQJIPGBJ
AhsMAAoJEKijtzH2E8vo+Y8An0zr8BtAzPVrwxoWg4yIrLCPKAxKAJ9rhIoD7Zrk
h6eXZT/2ouDGQxoI7A==
=BxWM
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE RPM-GPG-KEY-fedora-primary ---
-----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-----


--- NEW FILE RPM-GPG-KEY-fedora-test-ia64 ---
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v1.4.7 (GNU/Linux)

mQGiBEg8YEkRBACBI439uRaWbaRek2H2YjSN9ROQFQeYyj4tUf1cnwsZ9r8enZIy
VvsSwiDdSzR8wakFGmdjR9O5Lh2V/QHXYaTaTFBtSI4jDnITzkWQxKQaLbOyuBGs
kXeJRXYNhS9toxAh75Q0j2PTjeta0Fzqobg2ehUxSZuWD8c4LNCdjxawzwCglOkb
udBGDZ88EFucQyAZX8g5sbMD/j+LJ/ymm4IDFpFwVTwM3+JQpbyrt9LRH+UIDKRX
9aNrGbdGgVnujbuHLWaAwkpA7wDvvDXAahBIJYMbId2RSfVkKBnTjcgIO6dNeIof
ec0a50DY7wECLLhlszLog/cDL3ZHRSrH0S9o/FydBRlWAI3x84RxAlesPI1UjGOX
drmLA/99p9cZYnlrjKwy2vMP7Qj9aIMPmnthxah8s659UFM859NKC2WUheoMNIYg
hksC7LdyhHs1MCIW1lrlcydrxvJ4Wt5Em2e3IfFutOI4kJEVwGME8QJm3RTYVmD0
nHIJQcI/Zuj48nN62VbSfxafE/2B5JpXmQ/TUHkdpKJSUVemOLQpRmVkb3JhIGlh
NjQgPGZlZG9yYS1pYTY0LWxpc3RAcmVkaGF0LmNvbT6IYAQTEQIAIAUCSDxgSQIb
AwYLCQgHAwIEFQIIAwQWAgMBAh4BAheAAAoJEKijtzH2E8vodKYAnjOR2Q4JdAFW
Y4W6oFvdayD3dOvFAJ92AkZkTQln4rir7Jlbvcv6SXx66LkCDQRIPGBJEAgAq47Z
iOKt1BaVcXoxUKjoKdSam8r0VFCddj3cTdr2e8UpjsJe3Zq7Zg0htbA83T7gpeor
mUJQeuNNLy3QkJOZDdoAqePxXgor6o/3b/7ua9GbMdPTrhQrTmjRUK+SwPHcFBSz
Rm0Bh7UEqvtF9kHnvCdHEIfXMuxKtvZAjGww2KThBlO6FM9umgSbXwVppIDsCEY4
29yp5+TUHsjAWGdXd2KtFWOvdLPPJxOm+TRB4gUT1DbN+OxtLPBV5efbv20mvYvx
g3V93vgcrAgZDKuaho8z0O63/iIAEVR815gC8YmGgCRsFSKdYBbr+TPFw78oayAE
Zf40Q1RYjiD5DimZXwADBQf+L/YLN7MvnZXr00oi2NU0DRX6Z+wn4ZM0XkPYrG12
8ia3bwga26N+Y+lwrLD+RBMyvaD52ojBfUhaq/1xASAOUY62ZLBUw/zw6TKJuUN0
APeypK/mAvdz2eqXNnW5X1EEehPVsQO3mXrrzRcT77GW/GJFe4X+Urusn9MNLrKA
eDJLHymrkmlbgKC8zfr0gaGpcF9HeI42x7PNab/pKsByhlfvSEHt4KtLKmXFc5YU
xxBS3poNLtJq7z/CSbAIGAFas3OiFpFNBEnP4r00iiUJoJx7z5kBoLJVccAjMlZz
IeeO9j+srAgaeNn3GJGWlUz4qkZfqNn+hOwjbHjKgwv4U4hJBBgRAgAJBQJIPGBJ
AhsMAAoJEKijtzH2E8vo+Y8An0zr8BtAzPVrwxoWg4yIrLCPKAxKAJ9rhIoD7Zrk
h6eXZT/2ouDGQxoI7A==
=BxWM
-----END PGP PUBLIC KEY BLOCK-----


--- NEW FILE RPM-GPG-KEY-fedora-test-primary ---
-----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-----


Index: fedora-rawhide.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- fedora-rawhide.repo	22 Apr 2008 17:42:12 -0000	1.1.2.1
+++ fedora-rawhide.repo	25 Jun 2008 21:38:28 -0000	1.1.2.2
@@ -21,27 +21,27 @@
 [rawhide]
 name=Fedora - Rawhide
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/os/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/$basearch/debug/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/development/source/SRPMS/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/development/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.58.2.4
retrieving revision 1.58.2.5
diff -u -r1.58.2.4 -r1.58.2.5
--- fedora-release.spec	6 May 2008 16:42:55 -0000	1.58.2.4
+++ fedora-release.spec	25 Jun 2008 21:38:28 -0000	1.58.2.5
@@ -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: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -r1.10 -r1.10.2.1
--- fedora-updates-testing.repo	12 Dec 2007 21:28:21 -0000	1.10
+++ fedora-updates-testing.repo	25 Jun 2008 21:38:28 -0000	1.10.2.1
@@ -1,26 +1,26 @@
 [updates-testing]
 name=Fedora $releasever - $basearch - Test Updates
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/testing/$releasever/SRPMS/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/testing/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.14.6.1
retrieving revision 1.14.6.2
diff -u -r1.14.6.1 -r1.14.6.2
--- fedora-updates.repo	22 Apr 2008 17:42:12 -0000	1.14.6.1
+++ fedora-updates.repo	25 Jun 2008 21:38:28 -0000	1.14.6.2
@@ -1,26 +1,26 @@
 [updates]
 name=Fedora $releasever - $basearch - Updates
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-debuginfo]
 name=Fedora $releasever - $basearch - Updates - Debug
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/$basearch/debug/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-source]
 name=Fedora $releasever - Updates Source
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/updates/$releasever/SRPMS/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/updates/$releasever/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.12.6.1
retrieving revision 1.12.6.2
diff -u -r1.12.6.1 -r1.12.6.2
--- fedora.repo	22 Apr 2008 17:42:12 -0000	1.12.6.1
+++ fedora.repo	25 Jun 2008 21:38:28 -0000	1.12.6.2
@@ -1,26 +1,26 @@
 [fedora]
 name=Fedora $releasever - $basearch
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/os/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [fedora-debuginfo]
 name=Fedora $releasever - $basearch - Debug
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/$basearch/debug/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-debug-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [fedora-source]
 name=Fedora $releasever - Source
 failovermethod=priority
-#baseurl=http://download.fedora.redhat.com/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
+#baseurl=http://download.fedoraproject.org/pub/fedora/linux/releases/$releasever/Everything/source/SRPMS/
 mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch


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


--- RPM-GPG-KEY-beta DELETED ---


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


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


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


--- RPM-GPG-KEY-rawhide DELETED ---


