rpms/tzdata/F-13 tzdata-2010f-g.patch,1.1,1.2 tzdata.spec,1.95,1.96

Petr Machata pmachata at fedoraproject.org
Thu Mar 25 14:41:31 UTC 2010


Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv14588/F-13

Modified Files:
	tzdata-2010f-g.patch tzdata.spec 
Log Message:
- Fix the path in tzdata-2010f-g.patch


tzdata-2010f-g.patch:
 asia     |   71 +++++++++++++++++++++++-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 europe   |   12 !!!!!!!!!!
 zone.tab |    8 !!!!!!!
 3 files changed, 26 insertions(+), 2 deletions(-), 63 modifications(!)

Index: tzdata-2010f-g.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-13/tzdata-2010f-g.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- tzdata-2010f-g.patch	25 Mar 2010 14:12:26 -0000	1.1
+++ tzdata-2010f-g.patch	25 Mar 2010 14:41:30 -0000	1.2
@@ -17,8 +17,8 @@ If no problems are found, these will app
 				--ado
 
 diff -r -c old/asia new/asia
-*** old/asia	Wed Mar 17 10:33:04 2010
---- new/asia	Wed Mar 24 10:51:17 2010
+*** tzdata2010f/asia	Wed Mar 17 10:33:04 2010
+--- tzdata2010f/asia	Wed Mar 24 10:51:17 2010
 ***************
 *** 1,4 ****
 ! # @(#)asia	8.56
@@ -149,8 +149,8 @@ diff -r -c old/asia new/asia
   
   # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 diff -r -c old/europe new/europe
-*** old/europe	Wed Jan  6 10:21:33 2010
---- new/europe	Wed Mar 24 11:14:53 2010
+*** tzdata2010f/europe	Wed Jan  6 10:21:33 2010
+--- tzdata2010f/europe	Wed Mar 24 11:14:53 2010
 ***************
 *** 1,5 ****
   # <pre>
@@ -220,8 +220,8 @@ diff -r -c old/europe new/europe
   # Serbia
   # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 diff -r -c old/zone.tab new/zone.tab
-*** old/zone.tab	Wed Mar 17 11:01:07 2010
---- new/zone.tab	Wed Mar 24 11:14:53 2010
+*** tzdata2010f/zone.tab	Wed Mar 17 11:01:07 2010
+--- tzdata2010f/zone.tab	Wed Mar 24 11:14:53 2010
 ***************
 *** 1,5 ****
   # <pre>


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/F-13/tzdata.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -p -r1.95 -r1.96
--- tzdata.spec	25 Mar 2010 14:12:26 -0000	1.95
+++ tzdata.spec	25 Mar 2010 14:41:30 -0000	1.96
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2010f
 %define tzdata_version 2010f
 %define tzcode_version 2010f
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -51,7 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
-%patch1 -p1
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +113,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 25 2010 Petr Machata <pmachata at redhat.com> - 2010f-2
+- Fix the path in tzdata-2010f-g.patch
+
 * Thu Mar 25 2010 Petr Machata <pmachata at redhat.com> - 2010f-1
 - Upstream 2010f:
   - Changes to Australian stations in Antarctica



More information about the scm-commits mailing list