From 66c9ca6d44b8fe0f11b9488ca83ca9b3e8f3a477 Mon Sep 17 00:00:00 2001
From: Petr Machata <pmachata@fedoraproject.org>
Date: Sep 23 2009 10:43:09 +0000
Subject: - Upstream 2009m

- Palestine will will revert back to winter time on Friday, 2009-09-04
- Samoa passed the DST Bill that fixes DST dates for 2009 and 2010
- Drop Egypt patch

---

diff --git a/tzdata-2009m-karachi.patch b/tzdata-2009m-karachi.patch
new file mode 100644
index 0000000..d4ecf55
--- /dev/null
+++ b/tzdata-2009m-karachi.patch
@@ -0,0 +1,31 @@
+diff -up /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia\~ /home/petr/fedora/tzdata/devel/tzdata/tzdata2009m/asia
+--- tzdata2009m/asia~	2009-09-03 16:23:43.000000000 +0200
++++ tzdata2009m/asia	2009-09-18 13:14:26.000000000 +0200
+@@ -1674,8 +1674,14 @@ Zone	Asia/Muscat	3:54:20 -	LMT	1920
+ # advance clocks in the country by one hour from April 15 to
+ # conserve energy"
+ 
+-# From Arthur David Olson (2009-04-10):
+-# Assume for now that Pakistan will end DST in 2009 as it did in 2008.
++# From Steffen Thorsen (2009-09-17):
++# "The News International", Pakistan reports that: "The Federal
++# Government has decided to restore the previous time by moving the
++# clocks backward by one hour from October 1. A formal announcement to
++# this effect will be made after the Prime Minister grants approval in
++# this regard."  <a href="http://www.thenews.com.pk/updates.asp?id=87168">
++# http://www.thenews.com.pk/updates.asp?id=87168
++# </a>
+ 
+ # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+ Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
+@@ -1683,7 +1689,7 @@ Rule Pakistan	2002	only	-	Oct	Sun>=2	0:0
+ Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+ Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
+ Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
+-Rule Pakistan	2009	only	-	Nov	1	0:00	0	-
++Rule Pakistan	2009	only	-	Oct	1	0:00	0	-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ Zone	Asia/Karachi	4:28:12 -	LMT	1907
+ 			5:30	-	IST	1942 Sep
+
+Diff finished.  Fri Sep 18 13:14:30 2009
diff --git a/tzdata.spec b/tzdata.spec
index bd3cab8..0e44312 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2009m
-%define tzdata_version %{version}
+%define tzdata_version 2009m
 %define tzcode_version 2009k
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -16,6 +16,9 @@ Source0: tzdata-base-0.tar.bz2
 # 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
+# __decl_patches
+Patch1: tzdata-2009m-karachi.patch
+# __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: gawk, glibc, perl
@@ -47,6 +50,9 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
 sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
+# __apply_patches
+%patch1 -p0
+# __end
 
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
@@ -107,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Sep 22 2009 Petr Machata <pmachata@redhat.com> - 2009m-2
+- Add markers for autoupdate of spec file
+- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)
+
 * Wed Sep 16 2009 Petr Machata <pmachata@redhat.com> - 2009m-1
 - Upstream 2009m
   - Palestine will will revert back to winter time on Friday, 2009-09-04