rpms/generic-release/F-11 .cvsignore, 1.3, 1.4 generic-release.spec, 1.6, 1.7 sources, 1.4, 1.5

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/generic-release/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14512/F-11

Modified Files:
	.cvsignore generic-release.spec sources 
Log Message:
update F-11, rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/F-11/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Nov 2008 20:19:49 -0000	1.3
+++ .cvsignore	20 May 2009 17:03:15 -0000	1.4
@@ -1 +1 @@
-generic-release-10.90.tar.gz
+generic-release-11.tar.gz


Index: generic-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/F-11/generic-release.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- generic-release.spec	24 Feb 2009 20:32:31 -0000	1.6
+++ generic-release.spec	20 May 2009 17:03:15 -0000	1.7
@@ -3,8 +3,8 @@
 
 Summary:	Generic release files
 Name:		generic-release
-Version:	10.90
-Release:	3
+Version:	11
+Release:	1
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.gz
@@ -62,10 +62,8 @@ pushd $RPM_BUILD_ROOT/etc/pki/rpm-gpg/
 for arch in i386 x86_64 ppc ppc64
   do
   ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora-$arch
-  ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test-$arch
 done
 ln -s RPM-GPG-KEY-fedora-%{dist_version}-primary RPM-GPG-KEY-fedora
-ln -s RPM-GPG-KEY-fedora-test-%{dist_version}-primary RPM-GPG-KEY-fedora-test
 popd
 
 install -d -m 755 $RPM_BUILD_ROOT/etc/yum.repos.d
@@ -73,11 +71,6 @@ for file in fedora*repo ; do
   install -m 644 $file $RPM_BUILD_ROOT/etc/yum.repos.d
 done
 
-install -d -m 755 $RPM_BUILD_ROOT/%{_datadir}/%{name}
-for file in compose/*; do
-  install -m 644 $file $RPM_BUILD_ROOT/%{_datadir}/%{name}
-done
-
 # Set up the dist tag macros
 install -d -m 755 $RPM_BUILD_ROOT/etc/rpm
 cat >> $RPM_BUILD_ROOT/etc/rpm/macros.dist << EOF
@@ -103,8 +96,6 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %attr(0644,root,root) /etc/issue
 %config(noreplace) %attr(0644,root,root) /etc/issue.net
 %config %attr(0644,root,root) /etc/rpm/macros.dist
-%dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
 %dir /etc/pki/rpm-gpg
 /etc/pki/rpm-gpg/*
 
@@ -113,6 +104,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc README.Generic-Release-Notes
 
 %changelog
+* Wed May 20 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 11-1
+- resync with fedora-release package
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 10.90-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	20 Nov 2008 20:19:49 -0000	1.4
+++ sources	20 May 2009 17:03:15 -0000	1.5
@@ -1 +1 @@
-5927f22a2e6fb27f6d4a46f63ee29795  generic-release-10.90.tar.gz
+a2be639cd3e78484b8bafa65c1bc0f36  generic-release-11.tar.gz