rpms/fedora-release/devel fedora-release.spec, 1.37, 1.38 sources, 1.28, 1.29

[fedora-cvs-commits at redhat.com]

Author: jkeating

Update of /cvs/dist/rpms/fedora-release/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv6206

Modified Files:
	fedora-release.spec sources 
Log Message:
New tarball
fixes in the spec



Index: fedora-release.spec
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/fedora-release.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- fedora-release.spec	24 Jul 2006 00:14:21 -0000	1.37
+++ fedora-release.spec	24 Jul 2006 00:20:56 -0000	1.38
@@ -4,14 +4,14 @@
 Summary:	Fedora Core release files
 Name:		fedora-release
 Version:	5.91
-Release:	3
+Release:	4
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
 Source:		fedora-release-%{version}.tar.gz
-Obsoletes:	rawhide-release
 Obsoletes:	redhat-release
 Provides:	redhat-release
+Requires:	fedora-release-notes = %{version}
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch:	noarch
 
@@ -56,17 +56,19 @@
 %dir /etc/yum.repos.d
 %config(noreplace) /etc/yum.repos.d/*
 %doc eula.txt GPL 
-%config %attr(0644,root,root) /etc/issue
-%config %attr(0644,root,root) /etc/issue.net
+%config(noreplace) %attr(0644,root,root) /etc/issue
+%config(noreplace) %attr(0644,root,root) /etc/issue.net
 /usr/share/firstboot/modules/eula.py*
 /usr/share/eula/eula.en_US
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
 %changelog
-* Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-1
+* Sun Jul 23 2006 Jesse Keating <jkeating at redhat.com> - 5.91-4
 - Bump for FC6 Test2
 - Remove release-notes content, now standalone package
+- Don't replace issue and issue.net if the end user has modified it
+- Require fedora-release-notes
 - Cleanups
 
 * Mon Jun 19 2006 Jesse Keating <jkeating at redhat.com> - 5.90-3


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/fedora-release/devel/sources,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- sources	19 Jun 2006 20:58:55 -0000	1.28
+++ sources	24 Jul 2006 00:20:56 -0000	1.29
@@ -1,2 +1,3 @@
 b688647c2945d4982b16e404aa6a3fff  fedora-release-5.90.tar.gz
 5cbca2b54653efee1d014e572b133e1f  fedora-release-notes-5.90.tar.gz
+9b2fce1a73195895df5220588d237c73  fedora-release-5.91.tar.gz