From 8409787566ac71fa0e91602e98a417fc419128b7 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Aug 28 2008 17:59:20 +0000
Subject: - Pakistan DST is scheduled until Oct/31

- Morocco DST is scheduled until Aug/31

---

diff --git a/tzdata-2008e-pakistan+morocco.patch b/tzdata-2008e-pakistan+morocco.patch
new file mode 100644
index 0000000..caa0c15
--- /dev/null
+++ b/tzdata-2008e-pakistan+morocco.patch
@@ -0,0 +1,26 @@
+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~
diff --git a/tzdata.spec b/tzdata.spec
index 3af049d..ca1dde6 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,13 +3,14 @@ Name: tzdata
 Version: 2008e
 %define tzdata_version %{version}
 %define tzcode_version %{version}
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain, LGPLv2+
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
 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-2008e-pakistan+morocco.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
 BuildRequires: glibc-common >= 2.5.90-7
@@ -41,6 +42,7 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+%patch1 -p1
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -102,6 +104,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Aug 28 2008 Petr Machata <pmachata@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@redhat.com> - 2008e-1
 - Upstream 2008e
   - Changes for Mauritius