fedora-release fedora-extras-devel.repo, 1.7, 1.8 fedora-extras.repo, 1.1, 1.2 fedora-release.spec, 1.14, 1.15 fedora-updates.repo, 1.4, 1.5 fedora.repo, 1.4, 1.5

[Jeremy Katz (katzj)]

Author: katzj

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

Modified Files:
	fedora-extras-devel.repo fedora-extras.repo 
	fedora-release.spec fedora-updates.repo fedora.repo 
Log Message:
* update for how current release notes work
* enable repositories as appropriate for a test release
* bump version



Index: fedora-extras-devel.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras-devel.repo,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fedora-extras-devel.repo	25 May 2005 20:50:12 -0000	1.7
+++ fedora-extras-devel.repo	21 Nov 2005 02:59:35 -0000	1.8
@@ -2,6 +2,6 @@
 name=Fedora Extras $releasever - Development Tree
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/development/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-devel
-enabled=0
+enabled=1
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
-gpgcheck=0
+gpgcheck=1


Index: fedora-extras.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-extras.repo,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- fedora-extras.repo	25 May 2005 20:50:12 -0000	1.1
+++ fedora-extras.repo	21 Nov 2005 02:59:35 -0000	1.2
@@ -2,6 +2,6 @@
 name=Fedora Extras $releasever - $basearch
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/extras/$releasever/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-extras-$releasever
-enabled=1
+enabled=0
 gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-extras
 gpgcheck=1


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fedora-release.spec	28 Sep 2005 19:58:43 -0000	1.14
+++ fedora-release.spec	21 Nov 2005 02:59:35 -0000	1.15
@@ -1,5 +1,5 @@
-%define release_version 4
-%define release_name Stentz
+%define release_version 4.90
+%define release_name Pre-FC5
 %define builtin_release_version Rawhide
 %define builtin_release_name Rawhide
 %define real_release_version %{?release_version}%{!?release_version:%{builtin_release_version}}
@@ -28,13 +28,12 @@
 %setup -q -n fedora-release-%{version} -a 1
 
 %build
-make -C release-notes/FC4
 MAINDIR=`pwd`
-pushd release-notes/FC4
+pushd release-notes
 cp RELEASE-NOTES-en.txt $MAINDIR/RELEASE-NOTES
 cp README-en.txt $MAINDIR/README
-cp -af README-en/* $MAINDIR
-cp -af RELEASE-NOTES-en/* $MAINDIR
+cp -af README-* $MAINDIR
+cp -af RELEASE-NOTES-* $MAINDIR
 popd
 rm -f */*.eps
 make index.html


Index: fedora-updates.repo
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-updates.repo,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora-updates.repo	25 May 2005 20:50:12 -0000	1.4
+++ fedora-updates.repo	21 Nov 2005 02:59:35 -0000	1.5
@@ -2,6 +2,6 @@
 name=Fedora Core $releasever - $basearch - Released Updates
 #baseurl=http://download.fedora.redhat.com/pub/fedora/linux/core/updates/$releasever/$basearch/
 mirrorlist=http://fedora.redhat.com/download/mirrors/updates-released-fc$releasever
-enabled=1
+enabled=0
 gpgcheck=1
 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.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- fedora.repo	25 May 2005 20:50:12 -0000	1.4
+++ fedora.repo	21 Nov 2005 02:59:35 -0000	1.5
@@ -4,4 +4,4 @@
 mirrorlist=http://fedora.redhat.com/download/mirrors/fedora-core-$releasever
 enabled=1
 gpgcheck=1
-gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
+gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora file:///etc/pki/rpm-gpg/RPM-GPG-KEY file:///etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-test