From 82e3a4e7009d1388c4957c787fe50db5c06ba3c3 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: May 27 2008 15:33:15 +0000
Subject: - Morocco introduces DST


---

diff --git a/tzdata-casablanca.patch b/tzdata-casablanca.patch
new file mode 100644
index 0000000..798a2a0
--- /dev/null
+++ b/tzdata-casablanca.patch
@@ -0,0 +1,19 @@
+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~
diff --git a/tzdata.spec b/tzdata.spec
index 3dbba61..ccbfbc4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2008b
 %define tzdata_version %{version}
 %define tzcode_version 2008a
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain, LGPLv2+
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -11,6 +11,7 @@ Source0: tzdata-base-0.tar.bz2
 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
 BuildRequires: glibc-common >= 2.5.90-7
@@ -31,6 +32,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 %patch1 -p1
+%patch2 -p1
 
 %build
 make
@@ -57,6 +59,9 @@ rm -rf %{buildroot}
 %doc tzcode%{tzcode_version}/tz-link.html
 
 %changelog
+* Tue May 27 2008 Petr Machata <pmachata@redhat.com> - 2008b-3
+- Morocco introduces DST
+
 * Fri May 23 2008 Petr Machata <pmachata@redhat.com> - 2008b-2
 - Pakistan introduces DST