rpms/generic-release/devel .cvsignore, 1.4, 1.5 generic-release.spec, 1.9, 1.10 sources, 1.6, 1.7

Tom Callaway spot at fedoraproject.org
Wed Feb 17 21:57:38 UTC 2010


Author: spot

Update of /cvs/pkgs/rpms/generic-release/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27716/devel

Modified Files:
	.cvsignore generic-release.spec sources 
Log Message:
sync with new fedora-release in 13 & rawhide


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore	20 May 2009 17:03:15 -0000	1.4
+++ .cvsignore	17 Feb 2010 21:57:38 -0000	1.5
@@ -1 +1 @@
-generic-release-11.90.tar.gz
+generic-release-14.tar.gz


Index: generic-release.spec
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/devel/generic-release.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- generic-release.spec	16 Nov 2009 16:34:36 -0000	1.9
+++ generic-release.spec	17 Feb 2010 21:57:38 -0000	1.10
@@ -1,10 +1,10 @@
 %define release_name Generic
-%define dist_version 12
+%define dist_version 14
 
 Summary:	Generic release files
 Name:		generic-release
-Version:	12
-Release:	1
+Version:	14
+Release:	0.1
 License:	GPLv2
 Group:		System Environment/Base
 Source:		%{name}-%{version}.tar.gz
@@ -21,6 +21,14 @@ define the release. This package explici
 trademarked release package, if you are unable for any reason to abide by the 
 trademark restrictions on that release package.
 
+%package rawhide
+Summary:        Rawhide repo definitions
+Requires:	generic-release-%{version}-%{release}
+Conflicts:	fedora-release-rawhide
+
+%description rawhide
+This package provides the rawhide repo definitions.
+
 %package notes
 Summary:	Release Notes
 License:	Open Publication
@@ -92,7 +100,8 @@ rm -rf $RPM_BUILD_ROOT
 /etc/system-release
 %config %attr(0644,root,root) /etc/system-release-cpe
 %dir /etc/yum.repos.d
-%config(noreplace) /etc/yum.repos.d/*
+%config(noreplace) /etc/yum.repos.d/fedora.repo
+%config(noreplace) /etc/yum.repos.d/fedora-updates*.repo
 %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
@@ -103,7 +112,14 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %doc README.Generic-Release-Notes
 
+%files rawhide
+%defattr(-,root,root,-)
+%config(noreplace) /etc/yum.repos.d/fedora-rawhide.repo
+
 %changelog
+* Wed Feb 17 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 14-0.1
+- update to sync with fedora-release
+
 * Mon Nov 16 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 12-1
 - Update for F12 final
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/generic-release/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	16 Nov 2009 16:34:36 -0000	1.6
+++ sources	17 Feb 2010 21:57:38 -0000	1.7
@@ -1 +1 @@
-741921096a72830da7584e6d3569a4a8  generic-release-12.tar.gz
+9c7b5b5d62edc2f7a47cf9deefd071bb  generic-release-14.tar.gz



More information about the scm-commits mailing list