diff --git a/sources b/sources
index 5a7a1ed..f8e13c0 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
d181116286661375966a350e3e358cfa tzcode2009k.tar.gz
-5314fe1483c7c1be17c50f2c2171e06b tzdata2009m.tar.gz
+75c74b9c8df7c83c8e3c3068fff08a82 tzdata2009o.tar.gz
diff --git a/tzdata-2009m-karachi.patch b/tzdata-2009m-karachi.patch
deleted file mode 100644
index d4ecf55..0000000
--- a/tzdata-2009m-karachi.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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."
-+# http://www.thenews.com.pk/updates.asp?id=87168
-+#
-
- # 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-2009o-argentinas.patch b/tzdata-2009o-argentinas.patch
new file mode 100644
index 0000000..ce0b100
--- /dev/null
+++ b/tzdata-2009o-argentinas.patch
@@ -0,0 +1,19 @@
+--- tzdata2009o/southamerica~ 2009-10-16 13:23:49.000000000 +0000
++++ tzdata2009o/southamerica 2009-10-16 13:24:14.000000000 +0000
+@@ -215,9 +215,14 @@
+ # http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+ #
+
++# Margarita Manterola:
++# Same as always, Argentina's government just decided to change its mind
++# regarding DST, 2 days in advance.
++# http://www.lanacion.com.ar/nota.asp?nota_id=1186963&pid=7542694&toi=6275
++
+ Rule Arg 2007 only - Dec 30 0:00 1:00 S
+-Rule Arg 2008 max - Mar Sun>=15 0:00 0 -
+-Rule Arg 2008 max - Oct Sun>=15 0:00 1:00 S
++Rule Arg 2008 2009 - Mar Sun>=15 0:00 0 -
++Rule Arg 2008 only - Oct Sun>=15 0:00 1:00 S
+
+ # From Mariano Absatz (2004-05-21):
+ # Today it was officially published that the Province of Mendoza is changing
diff --git a/tzdata.spec b/tzdata.spec
index 575f2e4..5356ef1 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
Summary: Timezone data
Name: tzdata
-Version: 2009m
-%define tzdata_version 2009m
+Version: 2009o
+%define tzdata_version 2009o
%define tzcode_version 2009k
-Release: 2%{?dist}
+Release: 1%{?dist}
License: Public Domain
Group: System Environment/Base
URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,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
# __decl_patches
-Patch1: tzdata-2009m-karachi.patch
+Patch1: tzdata-2009o-argentinas.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,13 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
+* Mon Oct 19 2009 Petr Machata - 2009o-1
+- Upstream 2009o
+ - Bangladesh won't go back to Standard Time from October 1, 2009
+ - Pakistan leaves DST on October 1, 2009
+- Dropped tzdata-2009m-karachi.patch
+- Argentina does not enter DST on October 18 (tzdata-2009o-argentinas.patch)
+
* Tue Sep 22 2009 Petr Machata - 2009m-2
- Add markers for autoupdate of spec file
- Pakistan leaves the period of DST on October 1 (tzdata-2009m-karachi.patch)