rpms/tzdata/devel tzdata-casablanca.patch, NONE, 1.1 tzdata-karachi.patch, 1.1, 1.2 tzdata.spec, 1.63, 1.64

Petr Machata (pmachata) fedora-extras-commits at redhat.com
Tue May 27 15:30:24 UTC 2008


Author: pmachata

Update of /cvs/pkgs/rpms/tzdata/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv15304

Modified Files:
	tzdata-karachi.patch tzdata.spec 
Added Files:
	tzdata-casablanca.patch 
Log Message:
- Morocco introduces DST


tzdata-casablanca.patch:

--- NEW FILE tzdata-casablanca.patch ---
diff -urp tzdata/tzdata2008b/africa tzdata-pm/tzdata2008b/africa
--- tzdata/tzdata2008b/africa	2008-03-24 13:30:58.000000000 +0100
+++ tzdata-pm/tzdata2008b/africa	2008-05-26 13:38:43.000000000 +0200
@@ -416,11 +416,13 @@ Rule	Morocco	1976	only	-	Aug	 1	 0:00	0	
 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	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
-			 0:00	-	WET
+ 			 0:00	Morocco	WE%sT
 # Western Sahara
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
 			-1:00	-	WAT	1976 Apr 14
Only in tzdata-pm/tzdata2008b: africa~

tzdata-karachi.patch:

Index: tzdata-karachi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata-karachi.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tzdata-karachi.patch	23 May 2008 17:07:27 -0000	1.1
+++ tzdata-karachi.patch	27 May 2008 15:29:42 -0000	1.2
@@ -10,4 +10,3 @@
  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
  Zone	Asia/Karachi	4:28:12 -	LMT	1907
  			5:30	-	IST	1942 Sep
-Only in tzdata-pm/tzdata2008b: asia~


Index: tzdata.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tzdata/devel/tzdata.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- tzdata.spec	23 May 2008 17:07:27 -0000	1.63
+++ tzdata.spec	27 May 2008 15:29:42 -0000	1.64
@@ -3,7 +3,7 @@
 Version: 2008b
 %define tzdata_version %{version}
 %define tzcode_version 2008a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,6 +17,7 @@
 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-karachi.patch
+Patch2: tzdata-casablanca.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -49,6 +50,7 @@
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 %patch1 -p1
+%patch2 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -109,6 +111,9 @@
 %{_datadir}/javazi
 
 %changelog
+* Tue May 27 2008 Petr Machata <pmachata at redhat.com> - 2008b-3
+- Morocco introduces DST
+
 * Fri May 23 2008 Petr Machata <pmachata at redhat.com> - 2008b-2
 - Pakistan introduces DST
 




More information about the scm-commits mailing list