From 81e6baf86f85c645d7ddb187d759b25ac2fe56b3 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 3 Mar 2011 23:25:37 +0100 Subject: [PATCH 01/11] Tentative 2011c for Chile update - Update of historical stamps for Juneau, Sitka, and histcurrent stamps for Metlakatla. Sitka and Metlakatla are new zones. - Delay end of DST in Chile in 2011 until first Sunday in April. --- .gitignore | 2 + tzdata-2011b-c.patch | 303 +++++++++++++++++++++++++++++++++++++++++++ tzdata.spec | 9 +- 3 files changed, 313 insertions(+), 1 deletion(-) create mode 100644 tzdata-2011b-c.patch diff --git a/.gitignore b/.gitignore index 374b841..c031c4a 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,5 @@ tzdata2010l.tar.gz /tzcode2011a.tar.gz /tzdata2011b.tar.gz /tzcode2011b.tar.gz +tzdata/ +*.rpm diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch new file mode 100644 index 0000000..19e6901 --- /dev/null +++ b/tzdata-2011b-c.patch @@ -0,0 +1,303 @@ +diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds +*** tzdata2011b/leapseconds Thu Dec 16 12:24:20 2010 +--- tzdata2011b/leapseconds Mon Feb 14 09:30:33 2011 +*************** +*** 1,5 **** + # 
+! # @(#)leapseconds	8.10
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)leapseconds	8.11
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 56,68 ****
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 26
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 14 July 2010
+  #
+! # Bulletin C 40
+  #
+  # To authorities responsible
+  # for the measurement and
+--- 56,68 ----
+  # SERVICE DE LA ROTATION TERRESTRE
+  # OBSERVATOIRE DE PARIS
+  # 61, Av. de l'Observatoire 75014 PARIS (France)
+! # Tel.      : 33 (0) 1 40 51 22 29
+  # FAX       : 33 (0) 1 40 51 22 91
+  # Internet  : services.iers@obspm.fr
+  #
+! # Paris, 2 February 2011
+  #
+! # Bulletin C 41
+  #
+  # To authorities responsible
+  # for the measurement and
+***************
+*** 70,78 ****
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of December 2010.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+--- 70,78 ----
+  #
+  # INFORMATION ON UTC - TAI
+  #
+! # NO positive leap second will be introduced at the end of June 2011.
+  # The difference between Coordinated Universal Time UTC and the
+! # International Atomic Time TAI is :		
+  #
+  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
+  #
+***************
+*** 82,87 ****
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Director
+! # Earth Orientation Center of IERS
+  # Observatoire de Paris, France
+--- 82,87 ----
+  # will be no time step at the next possible date.
+  #
+  # Daniel GAMBIS
+! # Head			
+! # Earth Orientation Center of the IERS
+  # Observatoire de Paris, France
+diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
+*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
+--- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
+! # @(#)northamerica	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)northamerica	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 426,431 ****
+--- 426,473 ----
+  # were nearby inhabitants in some cases and for our purposes perhaps
+  # it's best to simply use the official transition.
+  #
++ 
++ # From Steve Ferguson (2011-01-31):
++ # The author lives in Alaska and many of the references listed are only
++ # available to Alaskan residents.
++ #
++ # 
++ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
++ # 
++ 
++ # From Arthur David Olson (2011-02-01):
++ # Here's database-relevant material from the 2001 "Alaska History" article:
++ #
++ # On September 20 [1979]...DOT...officials decreed that on April 27,
++ # 1980, Juneau and other nearby communities would move to Yukon Time.
++ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
++ # Pacific Time.
++ #
++ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
++ # Department's September 1979 decision. Juneau and other communities in
++ # northern Southeast reverted to Pacific Time on October 26.
++ #
++ # On October 28 [1983]...the Metlakatla Indian Community Council voted
++ # unanimously to keep the reservation on Pacific Time.
++ #
++ # According to DOT official Joanne Petrie, Indian reservations are not
++ # bound to follow time zones imposed by neighboring jurisdictions.
++ #
++ # (The last is consistent with how the database now handles the Navajo
++ # Nation.)
++ 
++ # From Arthur David Olson (2011-02-09):
++ # I just spoke by phone with a staff member at the Metlakatla Indian
++ # Community office (using contact information available at
++ # 
++ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
++ # ).
++ # It's shortly after 1:00 here on the east coast of the United States;
++ # the staffer said it was shortly after 10:00 there. When I asked whether
++ # that meant they were on Pacific time, they said no--they were on their
++ # own time. I asked about daylight saving; they said it wasn't used. I
++ # did not inquire about practices in the past.
++ 
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
+  			 -8:57:41 -	LMT	1900 Aug 20 12:00
+***************
+*** 432,440 ****
+--- 474,499 ----
+  			 -8:00	-	PST	1942
+  			 -8:00	US	P%sT	1946
+  			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1980 Apr 27 2:00
++ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
+  			 -8:00	US	P%sT	1983 Oct 30 2:00
+  			 -9:00	US	Y%sT	1983 Nov 30
+  			 -9:00	US	AK%sT
++ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
++ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -9:00	US	Y%sT	1983 Nov 30
++ 			 -9:00	US	AK%sT
++ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
++ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
++ 			 -8:00	-	PST	1942
++ 			 -8:00	US	P%sT	1946
++ 			 -8:00	-	PST	1969
++ 			 -8:00	US	P%sT	1983 Oct 30 2:00
++ 			 -8:00	US	MeST
+  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
+  			 -9:18:55 -	LMT	1900 Aug 20 12:00
+  			 -9:00	-	YST	1942
+diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
+*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
+--- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
+***************
+*** 1,5 ****
+  # 
+! # @(#)southamerica	8.44
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+--- 1,5 ----
+  # 
+! # @(#)southamerica	8.45
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  
+***************
+*** 1154,1159 ****
+--- 1154,1176 ----
+  # From Arthur Daivd Olson (2010-03-06):
+  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
+  
++ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
++ # It appears that the Chilean government has decided to postpone the
++ # change from summer time to winter time again, by three weeks to April
++ # 2nd:
++ # 
++ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
++ # 
++ #
++ # This is not yet reflected in the offical "cambio de hora" site, but
++ # probably will be soon:
++ # 
++ # http://www.horaoficial.cl/cambio.htm
++ # 
++ 
++ # From Arthur David Olson (2011-03-02):
++ # The emol.com article mentions a water shortage as the cause of the
++ # postponement, which may mean that it's not a permanent change.
+  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
+  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
+***************
+*** 1189,1196 ****
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
+! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+--- 1206,1213 ----
+  # which is used below in specifying the transition.
+  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
+! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
+  # (1996-09) says 1998-03-08.  Ignore these.
+  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
+*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
+--- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
+***************
+*** 9,15 ****
+  
+  
Time and the Arts

+  

+! @(#)tz-art.htm	8.19
+  

+  

+  This file is in the public domain, so clarified as of
+--- 9,15 ----
+  
+  
Time and the Arts

+  

+! @(#)tz-art.htm	8.20
+  

+  

+  This file is in the public domain, so clarified as of
+***************
+*** 417,422 ****
+--- 417,427 ----
+  http://us.imdb.com/title/tt0137494/
+  . (Mark Brader, 2009-10-02)
+  
++ 
  • 
++ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
++ Manmeet sets up teledates for 6:00 and 9:00;
++ since one is with a New Yorker and the other with a San Franciscan,
++ hilarity ensues.
+  
    • 
+  
+  
    
+diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
+*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
+--- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
+***************
+*** 1,5 ****
+  # 
    +! # @(#)zone.tab	8.40
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+--- 1,5 ----
+  # 
    +! # @(#)zone.tab	8.41
+  # This file is in the public domain, so clarified as of
+  # 2009-05-17 by Arthur David Olson.
+  #
+***************
+*** 412,420 ****
+--- 412,422 ----
+  US	+340308-1181434	America/Los_Angeles	Pacific Time
+  US	+611305-1495401	America/Anchorage	Alaska Time
+  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
++ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
+  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
+  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
+  US	+515248-1763929	America/Adak	Aleutian Islands
++ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
+  US	+211825-1575130	Pacific/Honolulu	Hawaii
+  UY	-3453-05611	America/Montevideo
+  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
+
diff --git a/tzdata.spec b/tzdata.spec
index 83ab7a6..fb3f34e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,6 +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-2011b-c.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -50,6 +51,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
     -e 's|@datadir@|%{_datadir}|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
+%patch1 -p0
 # __end
 
 mkdir javazic
@@ -111,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Thu Mar 03 2011 Petr Machata  - 2011b-3
+- Update of historical stamps for Juneau, Sitka, and histcurrent stamps
+  for Metlakatla.  Sitka and Metlakatla are new zones.
+- Delay end of DST in Chile in 2011 until first Sunday in April. (tzdata-2010b-c.patch)
+
 * Wed Feb 09 2011 Fedora Release Engineering  - 2011b-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 

From 17d416e8d2055632f6aa469268733fe52bbc428e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:18:19 +0100
Subject: [PATCH 02/11] Kemerovo oblast should use OMST/OMSST abbreviation

---
 tzdata-2011b-kemerovo.patch | 14 ++++++++++++++
 tzdata.spec                 |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011b-kemerovo.patch

diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011b-kemerovo.patch
new file mode 100644
index 0000000..2310c6e
--- /dev/null
+++ b/tzdata-2011b-kemerovo.patch
@@ -0,0 +1,14 @@
+diff -up tzdata2011b/europe\~ tzdata2011b/europe
+--- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+@@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
+ 			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
+ 			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
+ 			 7:00	Russia	KRA%sT	2010 Mar 28 2:00s
+-			 6:00	Russia	NOV%sT # Novosibirsk/Novokuznetsk Time
++			 6:00	Russia	OMS%sT # Novosibirsk/Novokuznetsk Time
+ 
+ #
+ # From Oscar van Vlijmen (2001-08-25): [This region consists of]
+
+Diff finished.  Fri Mar  4 00:11:35 2011
diff --git a/tzdata.spec b/tzdata.spec
index fb3f34e..a2b270c 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,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
 # __decl_patches
 Patch1: tzdata-2011b-c.patch
+Patch2: tzdata-2011b-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 04 2011 Petr Machata  - 2011b-4
+
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
+
 * Thu Mar 03 2011 Petr Machata  - 2011b-3
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From 6acf2886832fbf053442dbe84bb2060d493ff7ae Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:42:19 +0100
Subject: [PATCH 03/11] Upstream 2011d:

- Change end of DST in Samoa in 2011.
- Change start of DST in Cuba in 2011.
- Move start of DST in Turkey by one day in 2011.
---
 sources                                       |   4 +-
 tzdata-2011b-c.patch                          | 303 ------------------
 ...erovo.patch => tzdata-2011d-kemerovo.patch |   4 +-
 tzdata.spec                                   |  21 +-
 4 files changed, 16 insertions(+), 316 deletions(-)
 delete mode 100644 tzdata-2011b-c.patch
 rename tzdata-2011b-kemerovo.patch => tzdata-2011d-kemerovo.patch (79%)

diff --git a/sources b/sources
index 1d8dadd..4e8ee12 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-9eaf3ca354c42a32bd28e623539bf0e0  tzdata2011b.tar.gz
-c63a1425f7252aef1fe54a258cdccff8  tzcode2011b.tar.gz
+03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
+95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
diff --git a/tzdata-2011b-c.patch b/tzdata-2011b-c.patch
deleted file mode 100644
index 19e6901..0000000
--- a/tzdata-2011b-c.patch
+++ /dev/null
@@ -1,303 +0,0 @@
-diff -r -c tzdata2011b/leapseconds tzdata2011b/leapseconds
-*** tzdata2011b/leapseconds	Thu Dec 16 12:24:20 2010
---- tzdata2011b/leapseconds	Mon Feb 14 09:30:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)leapseconds	8.10
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)leapseconds	8.11
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 56,68 ****
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 26
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 14 July 2010
-  #
-! # Bulletin C 40
-  #
-  # To authorities responsible
-  # for the measurement and
---- 56,68 ----
-  # SERVICE DE LA ROTATION TERRESTRE
-  # OBSERVATOIRE DE PARIS
-  # 61, Av. de l'Observatoire 75014 PARIS (France)
-! # Tel.      : 33 (0) 1 40 51 22 29
-  # FAX       : 33 (0) 1 40 51 22 91
-  # Internet  : services.iers@obspm.fr
-  #
-! # Paris, 2 February 2011
-  #
-! # Bulletin C 41
-  #
-  # To authorities responsible
-  # for the measurement and
-***************
-*** 70,78 ****
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of December 2010.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
---- 70,78 ----
-  #
-  # INFORMATION ON UTC - TAI
-  #
-! # NO positive leap second will be introduced at the end of June 2011.
-  # The difference between Coordinated Universal Time UTC and the
-! # International Atomic Time TAI is :		
-  #
-  # from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
-  #
-***************
-*** 82,87 ****
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Director
-! # Earth Orientation Center of IERS
-  # Observatoire de Paris, France
---- 82,87 ----
-  # will be no time step at the next possible date.
-  #
-  # Daniel GAMBIS
-! # Head			
-! # Earth Orientation Center of the IERS
-  # Observatoire de Paris, France
-diff -r -c tzdata2011b/northamerica tzdata2011b/northamerica
-*** tzdata2011b/northamerica	Wed Jan 26 17:13:48 2011
---- tzdata2011b/northamerica	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 426,431 ****
---- 426,473 ----
-  # were nearby inhabitants in some cases and for our purposes perhaps
-  # it's best to simply use the official transition.
-  #
-+ 
-+ # From Steve Ferguson (2011-01-31):
-+ # The author lives in Alaska and many of the references listed are only
-+ # available to Alaskan residents.
-+ #
-+ # 
-+ # http://www.alaskahistoricalsociety.org/index.cfm?section=discover%20alaska&page=Glimpses%20of%20the%20Past&viewpost=2&ContentId=98
-+ # 
-+ 
-+ # From Arthur David Olson (2011-02-01):
-+ # Here's database-relevant material from the 2001 "Alaska History" article:
-+ #
-+ # On September 20 [1979]...DOT...officials decreed that on April 27,
-+ # 1980, Juneau and other nearby communities would move to Yukon Time.
-+ # Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
-+ # Pacific Time.
-+ #
-+ # ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
-+ # Department's September 1979 decision. Juneau and other communities in
-+ # northern Southeast reverted to Pacific Time on October 26.
-+ #
-+ # On October 28 [1983]...the Metlakatla Indian Community Council voted
-+ # unanimously to keep the reservation on Pacific Time.
-+ #
-+ # According to DOT official Joanne Petrie, Indian reservations are not
-+ # bound to follow time zones imposed by neighboring jurisdictions.
-+ #
-+ # (The last is consistent with how the database now handles the Navajo
-+ # Nation.)
-+ 
-+ # From Arthur David Olson (2011-02-09):
-+ # I just spoke by phone with a staff member at the Metlakatla Indian
-+ # Community office (using contact information available at
-+ # 
-+ # http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
-+ # ).
-+ # It's shortly after 1:00 here on the east coast of the United States;
-+ # the staffer said it was shortly after 10:00 there. When I asked whether
-+ # that meant they were on Pacific time, they said no--they were on their
-+ # own time. I asked about daylight saving; they said it wasn't used. I
-+ # did not inquire about practices in the past.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
-  			 -8:57:41 -	LMT	1900 Aug 20 12:00
-***************
-*** 432,440 ****
---- 474,499 ----
-  			 -8:00	-	PST	1942
-  			 -8:00	US	P%sT	1946
-  			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1980 Apr 27 2:00
-+ 			 -9:00	US	Y%sT	1980 Oct 26 2:00	
-  			 -8:00	US	P%sT	1983 Oct 30 2:00
-  			 -9:00	US	Y%sT	1983 Nov 30
-  			 -9:00	US	AK%sT
-+ Zone America/Sitka	 -14:58:47 -	LMT	1867 Oct 18
-+ 			 -9:01:13 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -9:00	US	Y%sT	1983 Nov 30
-+ 			 -9:00	US	AK%sT
-+ Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
-+ 			 -8:46:18 -	LMT	1900 Aug 20 12:00
-+ 			 -8:00	-	PST	1942
-+ 			 -8:00	US	P%sT	1946
-+ 			 -8:00	-	PST	1969
-+ 			 -8:00	US	P%sT	1983 Oct 30 2:00
-+ 			 -8:00	US	MeST
-  Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
-  			 -9:18:55 -	LMT	1900 Aug 20 12:00
-  			 -9:00	-	YST	1942
-diff -r -c tzdata2011b/southamerica tzdata2011b/southamerica
-*** tzdata2011b/southamerica	Thu Dec 16 12:24:20 2010
---- tzdata2011b/southamerica	Wed Mar  2 12:47:20 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)southamerica	8.44
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)southamerica	8.45
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1154,1159 ****
---- 1154,1176 ----
-  # From Arthur Daivd Olson (2010-03-06):
-  # Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-  
-+ # From Glenn Eychaner (2011-03-02): [geychaner@mac.com]
-+ # It appears that the Chilean government has decided to postpone the
-+ # change from summer time to winter time again, by three weeks to April
-+ # 2nd:
-+ # 
-+ # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651
-+ # 
-+ #
-+ # This is not yet reflected in the offical "cambio de hora" site, but
-+ # probably will be soon:
-+ # 
-+ # http://www.horaoficial.cl/cambio.htm
-+ # 
-+ 
-+ # From Arthur David Olson (2011-03-02):
-+ # The emol.com article mentions a water shortage as the cause of the
-+ # postponement, which may mean that it's not a permanent change.
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
-  Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-***************
-*** 1189,1196 ****
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	only	-	Apr	 4	3:00u	0	-
-! Rule	Chile	2011	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
---- 1206,1213 ----
-  # which is used below in specifying the transition.
-  Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-  Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-! Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-! Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
-  # IATA SSIM anomalies: (1992-02) says 1992-03-14;
-  # (1996-09) says 1998-03-08.  Ignore these.
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-diff -r -c tzdata2011b/tz-art.htm tzdata2011b/tz-art.htm
-*** tzcode2011b/tz-art.htm	Wed Jan 19 13:47:16 2011
---- tzcode2011b/tz-art.htm	Mon Feb 14 16:22:50 2011
-***************
-*** 9,15 ****
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.19
-  
    
-  
    
-  This file is in the public domain, so clarified as of
---- 9,15 ----
-  
-  
    Time and the Arts
    
-  
    
-! @(#)tz-art.htm	8.20
-  
    
-  
    
-  This file is in the public domain, so clarified as of
-***************
-*** 417,422 ****
---- 417,427 ----
-  http://us.imdb.com/title/tt0137494/
-  . (Mark Brader, 2009-10-02)
-  
-+ 
  • 
-+ In "The Todd Couple" episode of "Outsourced" (first aired 2011-02-10),
-+ Manmeet sets up teledates for 6:00 and 9:00;
-+ since one is with a New Yorker and the other with a San Franciscan,
-+ hilarity ensues.
-  
    • 
-  
-  
    
-diff -r -c tzdata2011b/zone.tab tzdata2011b/zone.tab
-*** tzdata2011b/zone.tab	Wed Jan 26 18:47:09 2011
---- tzdata2011b/zone.tab	Wed Feb  9 14:00:33 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.40
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.41
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 412,420 ****
---- 412,422 ----
-  US	+340308-1181434	America/Los_Angeles	Pacific Time
-  US	+611305-1495401	America/Anchorage	Alaska Time
-  US	+581807-1342511	America/Juneau	Alaska Time - Alaska panhandle
-+ US	+571035-1351807	America/Sitka	Alaska Time - southeast Alaska panhandle
-  US	+593249-1394338	America/Yakutat	Alaska Time - Alaska panhandle neck
-  US	+643004-1652423	America/Nome	Alaska Time - west Alaska
-  US	+515248-1763929	America/Adak	Aleutian Islands
-+ US	+550737-1313435	America/Metlakatla	Metlakatla Time - Annette Island
-  US	+211825-1575130	Pacific/Honolulu	Hawaii
-  UY	-3453-05611	America/Montevideo
-  UZ	+3940+06648	Asia/Samarkand	west Uzbekistan
-
diff --git a/tzdata-2011b-kemerovo.patch b/tzdata-2011d-kemerovo.patch
similarity index 79%
rename from tzdata-2011b-kemerovo.patch
rename to tzdata-2011d-kemerovo.patch
index 2310c6e..7c4fecd 100644
--- a/tzdata-2011b-kemerovo.patch
+++ b/tzdata-2011d-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011b/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011b/europe	2011-03-04 00:11:25.000000000 +0100
+--- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index a2b270c..ea8d4dd 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011b
-%define tzdata_version 2011b
-%define tzcode_version 2011b
-Release: 4%{?dist}
+Version: 2011d
+%define tzdata_version 2011d
+%define tzcode_version 2011d
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +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-2011b-c.patch
-Patch2: tzdata-2011b-kemerovo.patch
+Patch1: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,11 +113,16 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 15 2011 Petr Machata  - 2011d-1
+- Upstream 2011d:
+  - Change end of DST in Samoa in 2011.
+  - Change start of DST in Cuba in 2011.
+  - Move start of DST in Turkey by one day in 2011.
+- Dropped tzdata-2011b-c.patch
+
 * Fri Mar 04 2011 Petr Machata  - 2011b-4
-
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 
-
 * Thu Mar 03 2011 Petr Machata  - 2011b-3
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From 44daa8c2f02a5fa3e38b45d6b3305e173e3786f6 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 16:40:13 +0200
Subject: [PATCH 04/11] Delay end of DST in Chile in 2011 until May 7

---
 tzdata-2011d-chile.patch | 19 +++++++++++++++++++
 tzdata.spec              |  9 +++++++--
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 tzdata-2011d-chile.patch

diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
new file mode 100644
index 0000000..6651d6f
--- /dev/null
+++ b/tzdata-2011d-chile.patch
@@ -0,0 +1,19 @@
+--- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
++++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
+@@ -1201,5 +1201,5 @@
+ Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
+ Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
+-Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
++Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+ # N.B.: the end of March 29 in Chile is March 30 in Universal time,
+@@ -1207,5 +1207,8 @@
+ Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+ Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
+-Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
++Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
++Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
++Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
+ Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
+ # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata.spec b/tzdata.spec
index ea8d4dd..b0a8e7b 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,7 +17,8 @@ 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-2011d-kemerovo.patch
+Patch1: tzdata-2011d-chile.patch
+Patch2: tzdata-2011d-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Mar 29 2011 Petr Machata  - 2011d-2
+- Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
+
 * Tue Mar 15 2011 Petr Machata  - 2011d-1
 - Upstream 2011d:
   - Change end of DST in Samoa in 2011.

From 6203ab6d8064bd02bafe4fa441cddfc5c0e87338 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:58:17 +0200
Subject: [PATCH 05/11] Morocco introduced DST for 2011 from April 2 to July 31

---
 tzdata-2011d-morocco.patch | 15 +++++++++++++++
 tzdata.spec                |  7 ++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011d-morocco.patch

diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
new file mode 100644
index 0000000..a619608
--- /dev/null
+++ b/tzdata-2011d-morocco.patch
@@ -0,0 +1,15 @@
+diff -up tzdata2011d/africa\~ tzdata2011d/africa
+--- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
++++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
+@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
+ Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
+ Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
+ Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
++Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
++Rule	Morocco 2011	only	-	Aug	 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
+
+Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata.spec b/tzdata.spec
index b0a8e7b..f2ce2f0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011d
 %define tzdata_version 2011d
 %define tzcode_version 2011d
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011d-chile.patch
 Patch2: tzdata-2011d-kemerovo.patch
+Patch3: tzdata-2011d-morocco.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Mar 30 2011 Petr Machata  - 2011d-3
+- Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
+
 * Tue Mar 29 2011 Petr Machata  - 2011d-2
 - Delay end of DST in Chile in 2011 until May 7. (tzdata-2011d-chile.patch)
 

From 3793ae4790f7efbe54c16a5f9f42c5aa5707c440 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:29:01 +0200
Subject: [PATCH 06/11] Rebase to 2011g

- Upstream 2011e:
  - Morocco introduced DST for 2011 from April 2 to July 31.
  - Delay end of DST in Chile in 2011 until May 7.
- Upstream 2011f:
  - The Falkland Islands will not turn back clocks this winter, but
    stay on daylight saving time.
- Upstream 2011g:
  - Egypt abandons DST in 2011 (and forward)
- Dropped tzdata-2011d-chile.patch
- Dropped tzdata-2011d-morocco.patch
---
 sources                                       |  4 +--
 tzdata-2011d-chile.patch                      | 19 --------------
 tzdata-2011d-morocco.patch                    | 15 -----------
 ...erovo.patch => tzdata-2011g-kemerovo.patch |  6 ++---
 tzdata.spec                                   | 26 ++++++++++++-------
 5 files changed, 22 insertions(+), 48 deletions(-)
 delete mode 100644 tzdata-2011d-chile.patch
 delete mode 100644 tzdata-2011d-morocco.patch
 rename tzdata-2011d-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/sources b/sources
index 4e8ee12..ff93047 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-03c5793502b7c41985edd73146bf7e36  tzdata2011d.tar.gz
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
+cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
diff --git a/tzdata-2011d-chile.patch b/tzdata-2011d-chile.patch
deleted file mode 100644
index 6651d6f..0000000
--- a/tzdata-2011d-chile.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- tzdata2011d/southamerica.old	2011-03-02 14:47:20.000000000 -0300
-+++ tzdata2011d/southamerica	2011-03-28 10:47:24.000000000 -0300
-@@ -1201,5 +1201,5 @@
- Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
- Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
--Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-+Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
- # N.B.: the end of March 29 in Chile is March 30 in Universal time,
-@@ -1207,5 +1207,8 @@
- Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
- Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
--Rule	Chile	2010	2011	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
-+Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-+Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-+Rule	Chile	2012	max	-	Oct	Sun>=9	4:00u	1:00	S
- Rule	Chile	2012	max	-	Mar	Sun>=9	3:00u	0	-
- # IATA SSIM anomalies: (1992-02) says 1992-03-14;
diff --git a/tzdata-2011d-morocco.patch b/tzdata-2011d-morocco.patch
deleted file mode 100644
index a619608..0000000
--- a/tzdata-2011d-morocco.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -up tzdata2011d/africa\~ tzdata2011d/africa
---- tzdata2011d/africa~	2010-12-16 18:24:19.000000000 +0100
-+++ tzdata2011d/africa	2011-03-30 17:02:26.000000000 +0200
-@@ -735,6 +735,9 @@ Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:
- Rule	Morocco	2009	only	-	Aug	 21	 0:00	0	-
- Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
- Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-+Rule	Morocco 2011	only	-	Apr	 3	 0:00	1:00	S
-+Rule	Morocco 2011	only	-	Aug	 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
-
-Diff finished.  Wed Mar 30 17:02:32 2011
diff --git a/tzdata-2011d-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 7c4fecd..a590c4f 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011d/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011d/europe	2011-03-04 00:11:25.000000000 +0100
+diff -up tzdata2011g/europe\~ tzdata2011g/europe
+--- tzdata2011g/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011g/europe	2011-03-04 00:11:25.000000000 +0100
 @@ -2131,7 +2131,7 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index f2ce2f0..23da033 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011d
-%define tzdata_version 2011d
-%define tzcode_version 2011d
-Release: 3%{?dist}
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,9 +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-2011d-chile.patch
-Patch2: tzdata-2011d-kemerovo.patch
-Patch3: tzdata-2011d-morocco.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,8 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
-%patch3 -p0
 # __end
 
 mkdir javazic
@@ -117,6 +113,18 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011e:
+  - Morocco introduced DST for 2011 from April 2 to July 31.
+  - Delay end of DST in Chile in 2011 until May 7.
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time.
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+- Dropped tzdata-2011d-chile.patch
+- Dropped tzdata-2011d-morocco.patch
+
 * Wed Mar 30 2011 Petr Machata  - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
 

From e41d55ac0865d14a3502f28242a4dd7c8709066c Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:30:43 +0200
Subject: [PATCH 07/11] Update sources

---
 sources | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sources b/sources
index ff93047..b44920f 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
-fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz

From a67c3e7174e5c5be737f38dae8c7ce1e226694de Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:51:40 +0200
Subject: [PATCH 08/11] Patch for upcoming change in Newfoundland

---
 tzdata-2011h-labrador.patch | 22 ++++++++++++++++++++++
 tzdata.spec                 |  8 +++++++-
 2 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
new file mode 100644
index 0000000..f6c6aad
--- /dev/null
+++ b/tzdata-2011h-labrador.patch
@@ -0,0 +1,22 @@
+--- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
++++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
+@@ -1178,7 +1178,8 @@
+ 			-3:30:52 StJohns N%sT	1935 Mar 30
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+-			-3:30	StJohns	N%sT
++			-3:30	StJohns	N%sT	2011 Nov  6
++			-3:30	Canada	N%sT
+ 
+ # most of east Labrador
+ 
+@@ -1192,7 +1193,8 @@
+ 			-3:30	StJohns	N%sT	1942 May 11
+ 			-3:30	Canada	N%sT	1946
+ 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
+-			-4:00	StJohns	A%sT
++			-4:00	StJohns	A%sT	2011 Nov  6
++			-4:00	Canada	A%sT
+ 
+ 
+ # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 5a640ad..3d0b1e2 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011h
 %define tzdata_version 2011h
 %define tzcode_version 2011g
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -18,6 +18,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
 # __decl_patches
 Patch1: tzdata-2011h-kemerovo.patch
+Patch2: tzdata-2011h-labrador.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -52,6 +53,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
+%patch2 -p0
 # __end
 
 mkdir javazic
@@ -113,6 +115,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Aug 10 2011 Petr Machata  - 2011h-2
+- Patch for upcoming change in Newfoundland.  The transition time
+  changes from 12:01 AM to 2:00 AM.
+
 * Mon Jun 27 2011 Petr Machata  - 2011h-1
 - Upstream 2011h:
   - Russia abandons DST in 2011.

From 737fec97144350167104ba48fdf0c047b7195177 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 09/11] 2011i

new zones:
  Africa/Juba
     Introduced CAT (UTC+2, std) 31st (5th Wed) Dec 1930 21:53:36
     Introduced CAST (UTC+3, dst) 5th Thu Apr 22:00:00: 1970,1971
     Introduced CAST (UTC+3, dst) 29th Apr 22:00:00: 1972,1978
     Introduced CAST (UTC+3, dst) 4th Sat Apr 22:00:00: 1973-1977,1979-1985
     Introduced CAT (UTC+2, std) 14th Oct 21:00:00: 1970-1985
     Introduced EAT (UTC+3, std) 15th (3rd Sat) Jan 2000 10:00:00
     Introduced EAT-3: after last transition
changed zones:
  America/Metlakatla
     Dropped MeST (UTC-7, dst) 29th (5th Sun) Apr 1984 10:00:00
     Dropped MeST (UTC-7, dst) 4th Sun Apr 10:00:00: 1985,1986
     Dropped MeST (UTC-8, std) 4th Sun Oct 09:00:00: 1984-1987,1990,1992,1996,1998,2001,2003
     Dropped MeST (UTC-8, std) 5th Sun Oct 09:00:00: 1988,1989,1993,1995,1999,2000,2004,2006
     Dropped MeST (UTC-7, dst) 1st Sun Apr 10:00:00: 1987-2006
     Dropped MeST (UTC-8, std) 1st Sun Nov 09:00:00: 2007-2037
     Dropped MeST (UTC-7, dst) 2nd Sun Mar 10:00:00: 2007-2037
     Moved MeST8MeST,M3.2.0,M11.1.0 to MeST8: after last transition
  America/Resolute
     Introduced CDT (UTC-5, dst) 2nd Sun Mar 08:00:00: 2007-2037
     Introduced CST (UTC-6, std) 1st Sun Nov 07:00:00: 2007-2037
     Dropped CDT (UTC-5, std) 2nd Sun Mar 07:00:00: 2007-2407
     Dropped EST (UTC-5, std) 1st Sun Nov 07:00:00: 2007-2407
     Introduced CST6CDT,M3.2.0,M11.1.0: after last transition
  Europe/Kaliningrad
     Dropped EET (UTC+3, std) 27th Mar 2011 00:00:00
     Introduced KALT (UTC+3, std) 27th Mar 2011 00:00:00
     Moved EET-3 to KALT-3: after last transition
  Pacific/Apia
     Introduced WST (UTC+13, std) 30th Dec 2011 11:00:00
     Moved WST11 to WST-13: after last transition
---
 .gitignore                                    |  2 ++
 sources                                       |  4 ++--
 ...erovo.patch => tzdata-2011i-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 21 +++++++++++++------
 4 files changed, 21 insertions(+), 10 deletions(-)
 rename tzdata-2011h-kemerovo.patch => tzdata-2011i-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index 40cf432..e60390d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -64,3 +64,5 @@ tzdata/
 noarch/
 .build-*
 /tzdata2011h.tar.gz
+/tzdata2011i.tar.gz
+/tzcode2011i.tar.gz
diff --git a/sources b/sources
index 4d14f09..b7418fb 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
-546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
+c7a86ec34f30f8d6aa77ef94902a3047  tzdata2011i.tar.gz
+cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
diff --git a/tzdata-2011h-kemerovo.patch b/tzdata-2011i-kemerovo.patch
similarity index 81%
rename from tzdata-2011h-kemerovo.patch
rename to tzdata-2011i-kemerovo.patch
index ff6da57..ef52390 100644
--- a/tzdata-2011h-kemerovo.patch
+++ b/tzdata-2011i-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011h/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011h/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011i/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011i/europe	2011-06-27 16:49:39.323493224 +0200
 @@ -2158,8 +2158,8 @@ Zone Asia/Novokuznetsk	 5:48:48 -	NMT	19
  			 7:00	Russia	KRA%sT	1991 Mar 31 2:00s
  			 6:00	Russia	KRA%sT	1992 Jan 19 2:00s
diff --git a/tzdata.spec b/tzdata.spec
index 3d0b1e2..8b55f39 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
 Version: 2011h
-%define tzdata_version 2011h
-%define tzcode_version 2011g
-Release: 2%{?dist}
+%define tzdata_version 2011i
+%define tzcode_version 2011i
+Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://elsie.nci.nih.gov/pub/
@@ -17,8 +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-2011h-kemerovo.patch
-Patch2: tzdata-2011h-labrador.patch
+Patch1: tzdata-2011i-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -53,7 +52,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
   Makeconfig.in > Makeconfig
 # __apply_patches
 %patch1 -p0
-%patch2 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +113,17 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Aug 29 2011 Petr Machata  - 2011h-1
+- Upstream 2011i:
+  - Add Africa/Juba (South Sudan) zone
+  - Samoa skips over the date line on 2011-12-30
+  - Use KALT as abbreviation for Europe/Kalinigrad
+  - Canonical version of the Newfoundland patch
+  - Change America/Resolute use of EST to 2006-2007 only
+  - Assume Metlakatla abandoned use of daylight saving in 1983
+  - Sync iso3166.tab and zone.tab with above
+- Resolved: #734063
+
 * Wed Aug 10 2011 Petr Machata  - 2011h-2
 - Patch for upcoming change in Newfoundland.  The transition time
   changes from 12:01 AM to 2:00 AM.

From c7f5e9c6981e3b965c718969df7b6c9c24ee85b4 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 10/11] Drop patch, bump version

---
 tzdata-2011h-labrador.patch | 22 ----------------------
 tzdata.spec                 |  2 +-
 2 files changed, 1 insertion(+), 23 deletions(-)
 delete mode 100644 tzdata-2011h-labrador.patch

diff --git a/tzdata-2011h-labrador.patch b/tzdata-2011h-labrador.patch
deleted file mode 100644
index f6c6aad..0000000
--- a/tzdata-2011h-labrador.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- tzdata2011h/northamerica~	2011-06-15 11:05:20.000000000 +0000
-+++ tzdata2011h/northamerica	2011-08-05 20:04:17.000000000 +0000
-@@ -1178,7 +1178,8 @@
- 			-3:30:52 StJohns N%sT	1935 Mar 30
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
--			-3:30	StJohns	N%sT
-+			-3:30	StJohns	N%sT	2011 Nov  6
-+			-3:30	Canada	N%sT
- 
- # most of east Labrador
- 
-@@ -1192,7 +1193,8 @@
- 			-3:30	StJohns	N%sT	1942 May 11
- 			-3:30	Canada	N%sT	1946
- 			-3:30	StJohns	N%sT	1966 Mar 15 2:00
--			-4:00	StJohns	A%sT
-+			-4:00	StJohns	A%sT	2011 Nov  6
-+			-4:00	Canada	A%sT
- 
- 
- # west Labrador, Nova Scotia, Prince Edward I
diff --git a/tzdata.spec b/tzdata.spec
index 8b55f39..03352af 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,6 +1,6 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011h
+Version: 2011i
 %define tzdata_version 2011i
 %define tzcode_version 2011i
 Release: 1%{?dist}

From 0acc4ba06f36b2b6beec1e4b0f0d4657e590a915 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 19 Oct 2011 15:26:20 +0200
Subject: [PATCH 11/11] Ukraine will enter Winter Time after all

---
 tzdata-2011j-ukraine.patch | 76 ++++++++++++++++++++++++++++++++++++++
 tzdata.spec                |  7 +++-
 2 files changed, 82 insertions(+), 1 deletion(-)
 create mode 100644 tzdata-2011j-ukraine.patch

diff --git a/tzdata-2011j-ukraine.patch b/tzdata-2011j-ukraine.patch
new file mode 100644
index 0000000..626f56a
--- /dev/null
+++ b/tzdata-2011j-ukraine.patch
@@ -0,0 +1,76 @@
+commit 4182c08d1b5d3bc82e834f645abef670d1776659
+Author: tz 
+Date:   Mon Sep 26 21:30:36 2011 +0200
+diff --git a/europe b/europe
+index baed8fe..a2ec972 100644
+--- tzdata2011l/europe
++++ tzdata2011l/europe
+@@ -2613,28 +2630,6 @@ Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
+ # of March at 3am the time is changing to 4am and each last Sunday of
+ # October the time at 4am is changing to 3am"
+ 
+-# From Alexander Krivenyshev (2011-09-20):
+-# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
+-# abolish the transfer clock to winter time.
+-#
+-# Bill number 8330 of MP from the Party of Regions Oleg Nadoshi got
+-# approval from 266 deputies.
+-#
+-# Ukraine abolishes transter back to the winter time (in Russian)
+-# 
+-# http://news.mail.ru/politics/6861560/
+-# 
+-#
+-# The Ukrainians will no longer change the clock (in Russian)
+-# 
+-# http://www.segodnya.ua/news/14290482.html
+-# 
+-#
+-# Deputies cancelled the winter time (in Russian)
+-# 
+-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
+-# 
+-
+ # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
+ # Most of Ukraine since 1970 has been like Kiev.
+ # "Kyiv" is the transliteration of the Ukrainian name, but
+@@ -2626,8 +2665,7 @@ Zone Europe/Kiev	2:02:04 -	LMT	1880
+ 			3:00	-	MSK	1990 Jul  1 2:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Ruthenia used CET 1990/1991.
+ # "Uzhhorod" is the transliteration of the Ukrainian name, but
+ # "Uzhgorod" is more common in English.
+@@ -2640,8 +2680,7 @@ Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
+ 			1:00	-	CET	1991 Mar 31 3:00
+ 			2:00	-	EET	1992
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
+ # "Zaporizhia" is the transliteration of the Ukrainian name, but
+ # "Zaporozh'ye" is more common in English.  Use the common English
+@@ -2653,8 +2694,7 @@ Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
+ 			1:00	C-Eur	CE%sT	1943 Oct 25
+ 			3:00	Russia	MSK/MSD	1991 Mar 31 2:00
+ 			2:00	E-Eur	EE%sT	1995
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ # Central Crimea used Moscow time 1994/1997.
+ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ 			2:16	-	SMT	1924 May  2 # Simferopol Mean T
+@@ -2678,8 +2720,7 @@ Zone Europe/Simferopol	2:16:24 -	LMT	1880
+ # Assume it happened in March by not changing the clocks.
+ 			3:00	Russia	MSK/MSD	1997
+ 			3:00	-	MSK	1997 Mar lastSun 1:00u
++			2:00	EU	EE%sT
+-			2:00	EU	EE%sT	2011 Mar lastSun 1:00u
+-			3:00	-	FET # Further-eastern European Time
+ 
+ ###############################################################################
+ 
diff --git a/tzdata.spec b/tzdata.spec
index 805123c..3cc4f50 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011l
 %define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: Public Domain
 Group: System Environment/Base
 URL: ftp://munnari.oz.au/pub/
@@ -19,6 +19,7 @@ Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
 Patch1: tzdata-2011l-kemerovo.patch
 Patch2: tzdata-2011l-brazil.patch
+Patch3: tzdata-2011j-ukraine.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -54,6 +55,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
 # __apply_patches
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 # __end
 
 mkdir javazic
@@ -115,6 +117,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Oct 19 2011 Petr Machata  - 2011l-3
+- Ukraine will enter Winter Time after all
+
 * Fri Oct 14 2011 Petr Machata  - 2011l-2
 - State of Bahia, Brazil, to resume Summer Time on Oct 16
 - The project moved, reflect this in URL