fedora-release eula.py, 1.3, 1.4 fedora-release.spec, 1.36, 1.37 README-Accessibility, 1.1.1.1, NONE

[Jesse Keating (jkeating)]

Author: jkeating

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

Modified Files:
	eula.py fedora-release.spec 
Removed Files:
	README-Accessibility 
Log Message:
Changes needed for package review



Index: eula.py
===================================================================
RCS file: /cvs/fedora/fedora-release/eula.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- eula.py	27 Jul 2006 16:45:40 -0000	1.3
+++ eula.py	13 Feb 2007 21:39:18 -0000	1.4
@@ -1,3 +1,17 @@
+## This program is free software; you can redistribute it and/or modify
+## it under the terms of the GNU General Public License as published by
+## the Free Software Foundation; either version 2 of the License, or
+## (at your option) any later version.
+##
+## This program is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+## GNU General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with this program; if not, write to the Free Software
+## Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
 from gtk import *
 import string
 import gtk


Index: fedora-release.spec
===================================================================
RCS file: /cvs/fedora/fedora-release/fedora-release.spec,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- fedora-release.spec	6 Feb 2007 00:06:08 -0000	1.36
+++ fedora-release.spec	13 Feb 2007 21:39:18 -0000	1.37
@@ -3,11 +3,11 @@
 Summary:	Fedora release files
 Name:		fedora-release
 Version:	6.90
-Release:	3
+Release:	4
 License:	GFDL
 Group:		System Environment/Base
 URL:		http://fedoraproject.org
-Source:		fedora-release-6.tar.gz
+Source:		%{name}-%{version}.tar.gz
 Obsoletes:	redhat-release
 Provides:	redhat-release
 Requires:	fedora-release-notes >= 6
@@ -15,32 +15,34 @@
 BuildArch:	noarch
 
 %description
-Fedora release files
+Fedora release files such as yum configs, eula, and various /etc/ files that
+define the release.
 
 %prep
-%setup -q -n fedora-release-6
+%setup -q
 
 %build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT/etc
+install -d $RPM_BUILD_ROOT/etc
 echo "Fedora release %{version} (%{release_name})" > $RPM_BUILD_ROOT/etc/fedora-release
-cp $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
+cp -p $RPM_BUILD_ROOT/etc/fedora-release $RPM_BUILD_ROOT/etc/issue
 echo "Kernel \r on an \m" >> $RPM_BUILD_ROOT/etc/issue
-cp $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
+cp -p $RPM_BUILD_ROOT/etc/issue $RPM_BUILD_ROOT/etc/issue.net
 echo >> $RPM_BUILD_ROOT/etc/issue
 ln -s fedora-release $RPM_BUILD_ROOT/etc/redhat-release
-mkdir -p $RPM_BUILD_ROOT/usr/share/eula $RPM_BUILD_ROOT/usr/share/firstboot/modules
-cp -f eula.txt $RPM_BUILD_ROOT/usr/share/eula/eula.en_US
-cp -f eula.py $RPM_BUILD_ROOT/usr/share/firstboot/modules/eula.py
+install -d $RPM_BUILD_ROOT/usr/share/eula 
+install -d $RPM_BUILD_ROOT/usr/share/firstboot/modules
+cp -p eula.txt $RPM_BUILD_ROOT/usr/share/eula/eula.en_US
+cp -p eula.py $RPM_BUILD_ROOT/usr/share/firstboot/modules/eula.py
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/pki/rpm-gpg
+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
 done
 
-mkdir -p -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
+install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
 for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
@@ -49,7 +51,7 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
-%defattr(-,root,root)
+%defattr(-,root,root,-)
 %attr(0644,root,root) /etc/fedora-release
 /etc/redhat-release
 %dir /etc/yum.repos.d
@@ -63,6 +65,9 @@
 /etc/pki/rpm-gpg/*
 
 %changelog
+* Tue Feb 13 2007 Jesse Keating <jkeating at redhat.com> - 6.90-4
+- Specfile cleanups
+
 * Mon Feb 05 2007 Jesse Keating <jkeating at redhat.com> - 6.90-3
 - Drop the legacy repo file.
 


--- README-Accessibility DELETED ---