fedora-release fedora-rawhide.repo, 1.5.4.1, 1.5.4.2 fedora-release.spec, 1.76.2.2, 1.76.2.3 fedora-updates-testing.repo, 1.14, 1.14.2.1

[Jesse Keating]

Author: jkeating

Update of /cvs/fedora/fedora-release
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11211

Modified Files:
      Tag: F-12
	fedora-rawhide.repo fedora-release.spec 
	fedora-updates-testing.repo 
Log Message:
Fix key paths in repo files



Index: fedora-rawhide.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-rawhide.repo,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- fedora-rawhide.repo	2 Nov 2009 22:15:04 -0000	1.5.4.1
+++ fedora-rawhide.repo	11 Nov 2009 16:21:03 -0000	1.5.4.2
@@ -25,7 +25,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-debuginfo]
 name=Fedora - Rawhide - Debug
@@ -34,7 +34,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-debug&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora--$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [rawhide-source]
 name=Fedora - Rawhide - Source
@@ -43,5 +43,5 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide-source&arch=$basearch
 enabled=0
 gpgcheck=0
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$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.76.2.2
retrieving revision 1.76.2.3
diff -u -r1.76.2.2 -r1.76.2.3
--- fedora-release.spec	2 Nov 2009 22:15:04 -0000	1.76.2.2
+++ fedora-release.spec	11 Nov 2009 16:21:04 -0000	1.76.2.3
@@ -4,7 +4,7 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	12
-Release:	1
+Release:	2
 License:	GPLv2
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
@@ -84,6 +84,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Wed Nov 11 2009 Jesse Keating <jkeating at redhat.com> - 12-2
+- Fix key paths in repo files for updates-testing and rawhide
+
 * Mon Nov 02 2009 Jesse Keating <jkeating at redhat.com> - 12-1
 - Set up for Fedora 12
 


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -r1.14 -r1.14.2.1
--- fedora-updates-testing.repo	7 Aug 2009 23:09:15 -0000	1.14
+++ fedora-updates-testing.repo	11 Nov 2009 16:21:04 -0000	1.14.2.1
@@ -5,7 +5,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-testing-debuginfo]
 name=Fedora $releasever - $basearch - Test Updates Debug
@@ -14,7 +14,7 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-debug-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch
 
 [updates-testing-source]
 name=Fedora $releasever - Test Updates Source
@@ -23,4 +23,4 @@
 mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=updates-testing-source-f$releasever&arch=$basearch
 enabled=0
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test-$basearch
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-$basearch