rpms/tzdata/devel tzdata-2008e-pakistan+morocco.patch, NONE, 1.1 tzdata.spec, 1.67, 1.68

Petr Machata pmachata at fedoraproject.org
Thu Aug 28 17:14:32 UTC 2008


Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18922

Modified Files:
	tzdata.spec 
Added Files:
	tzdata-2008e-pakistan+morocco.patch 
Log Message:
- Pakistan DST is scheduled until Oct/31
- Morocco DST is scheduled until Aug/31


tzdata-2008e-pakistan+morocco.patch:

--- NEW FILE tzdata-2008e-pakistan+morocco.patch ---
diff -urp tzdata/tzdata2008e/africa tzdata-2008e/tzdata2008e/africa
--- tzdata/tzdata2008e/africa	2008-07-20 21:47:07.000000000 +0200
+++ tzdata-2008e/tzdata2008e/africa	2008-08-28 13:17:44.000000000 +0200
@@ -542,7 +542,7 @@ Rule	Morocco	1977	only	-	Sep	28	 0:00	0	
 Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
 Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
-Rule	Morocco	2008	only	-	Sep	28	 0:00	0	-
+Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
Only in tzdata-2008e/tzdata2008e/: africa~
diff -urp tzdata/tzdata2008e/asia tzdata-2008e/tzdata2008e/asia
--- tzdata/tzdata2008e/asia	2008-07-20 21:09:44.000000000 +0200
+++ tzdata-2008e/tzdata2008e/asia	2008-08-28 13:17:44.000000000 +0200
@@ -1545,7 +1545,7 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
 Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
-Rule Pakistan	2008	only	-	Sep	1	0:00	0	-
+Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep
Only in tzdata-2008e/tzdata2008e/: asia~


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -r1.67 -r1.68
--- tzdata.spec	12 Aug 2008 08:48:54 -0000	1.67
+++ tzdata.spec	28 Aug 2008 17:14:02 -0000	1.68
@@ -3,7 +3,7 @@
 Version: 2008e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,7 @@
 # These are official upstream.
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
+Patch1: tzdata-2008e-pakistan+morocco.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +48,7 @@
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +109,10 @@
 %{_datadir}/javazi
 
 %changelog
+* Thu Aug 28 2008 Petr Machata <pmachata at redhat.com> - 2008e-2
+- Pakistan DST is scheduled until Oct/31
+- Morocco DST is scheduled until Aug/31
+
 * Tue Aug 12 2008 Petr Machata <pmachata at redhat.com> - 2008e-1
 - Upstream 2008e
   - Changes for Mauritius




More information about the fedora-extras-commits mailing list