fedora-release fedora-extras-devel.repo, 1.5, 1.6 fedora-release.spec, 1.8, 1.9 fedora-updates-testing.repo, 1.2, 1.3 fedora-updates.repo, 1.2, 1.3 fedora.repo, 1.2, 1.3

[Warren Togami (wtogami)]

Author: wtogami

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

Modified Files:
	fedora-extras-devel.repo fedora-release.spec 
	fedora-updates-testing.repo fedora-updates.repo fedora.repo 
Log Message:
move RPM-GPG-KEY* to /etc/pki/rpm-gpg



Index: fedora-extras-devel.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-devel.repo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fedora-extras-devel.repo	18 May 2005 20:58:49 -0000	1.5
+++ fedora-extras-devel.repo	25 May 2005 09:05:53 -0000	1.6
@@ -3,5 +3,5 @@
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
 enabled=1
-gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora-extras
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=0


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- fedora-release.spec	18 May 2005 20:58:49 -0000	1.8
+++ fedora-release.spec	25 May 2005 09:05:53 -0000	1.9
@@ -48,10 +48,15 @@
 
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/sysconfig/rhn
 mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
+mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
 install -m 644 sources $RPM_BUILD_ROOT/etc/sysconfig/rhn/sources
 for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
+for file in RPM-GPG-KEY* ; do
+  install -m 644 $file $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+done
+
 
 ln -s fedora-release-%{version} $RPM_BUILD_ROOT%{_defaultdocdir}/fedora-release
 
@@ -77,9 +82,10 @@
 /etc/redhat-release
 %dir /etc/sysconfig/rhn
 %dir /etc/yum.repos.d
+%dir /etc/pki/rpm-gpg
 %config(noreplace) /etc/sysconfig/rhn/sources
 %config(noreplace) /etc/yum.repos.d/*
-%doc R*
+/etc/pki/rpm-gpg/*
 %doc eula.txt GPL autorun-template
 %config %attr(0644,root,root) /etc/issue
 %config %attr(0644,root,root) /etc/issue.net


Index: fedora-updates-testing.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates-testing.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-updates-testing.repo	18 May 2005 20:58:49 -0000	1.2
+++ fedora-updates-testing.repo	25 May 2005 09:05:53 -0000	1.3
@@ -4,4 +4,4 @@
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-testing-fc$releasever
 enabled=0
 gpgcheck=1
-gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora-test
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora-updates.repo	18 May 2005 20:58:49 -0000	1.2
+++ fedora-updates.repo	25 May 2005 09:05:53 -0000	1.3
@@ -4,4 +4,4 @@
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever
 enabled=0
 gpgcheck=1
-gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora


Index: fedora.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora.repo,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- fedora.repo	18 May 2005 20:58:49 -0000	1.2
+++ fedora.repo	25 May 2005 09:05:53 -0000	1.3
@@ -4,4 +4,4 @@
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
 enabled=0
 gpgcheck=1
-gpgkey=file:///usr/share/doc/fedora-release/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora