From 612b2c71538c8b9c6493e9775a1cbd55c23ac0c0 Mon Sep 17 00:00:00 2001 From: "Tom \"spot\" Callaway" Date: Tue, 3 Aug 2010 09:30:46 -0400 Subject: [PATCH 01/14] 2010k --- sources | 4 ++-- tzdata.spec | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 365ab5b..026b909 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -f668f66b260e14b477eac3f48bcfb5f4 tzdata2010j.tar.gz -5ba8345720296d3a659b349b2052d139 tzcode2010j.tar.gz +5e2086249d6a6bb116534d358661ad3f tzdata2010k.tar.gz +63cd2199679c91bed972a0248d6916af tzcode2010k.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 6b7f561..7a38ba1 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2010j -%define tzdata_version 2010j -%define tzcode_version 2010j +Version: 2010k +%define tzdata_version 2010k +%define tzcode_version 2010k Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -111,6 +111,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Aug 3 2010 Tom "spot" Callaway - 2010k-1 +- Upstream 2010k: + - Egypt has announced that DST will be off during Ramadan, but + DST will resume afterwards (August 10, 2010 - September 9, 2010) + * Tue May 11 2010 Petr Machata - 2010j-1 - Upstream 2010j: - Bahia de Banderas (Mexican state of Nayarit) changed time zone From 9832396781a434cd5e96023373dac2438a2446f7 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 27 Oct 2010 18:00:15 +0200 Subject: [PATCH 02/14] - Upstream 2010m: - Hong Kong didn't observe DST in 1977 - In zone.tab, remove obsolete association of Vostok Station with South Magnetic Pole; add association with Lake Vostok - Upstream 2010n: - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to 2011-04-03 1:00 --- sources | 4 ++-- tzdata.spec | 16 +++++++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/sources b/sources index b638b09..d9d3a08 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -77668c37a0b13753c65eee5db3a4b009 tzcode2010l.tar.gz -0458bd8ffd537146d34b1a658c42efa5 tzdata2010l.tar.gz +b5eefb4986866895ab84f52220f1dfa6 tzdata2010n.tar.gz +a7a776a5713831993e814fe0c05f9fd5 tzcode2010n.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 1d9c8f8..de951ae 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2010l -%define tzdata_version 2010l -%define tzcode_version 2010l +Version: 2010n +%define tzdata_version 2010n +%define tzcode_version 2010n Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -111,6 +111,16 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Oct 27 2010 Petr Machata - 2010n-1 +- Upstream 2010m: + - Hong Kong didn't observe DST in 1977 + - In zone.tab, remove obsolete association of Vostok Station with + South Magnetic Pole; add association with Lake Vostok +- Upstream 2010n: + - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to + 2011-04-03 1:00 + + * Mon Aug 16 2010 Petr Machata - 2010l-2 - Upstream 2010l: - Change Cairo's 2010 reversion to DST from the midnight between From 1f809e7333b855a1700c83723ab39b9a5934d0e1 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 9 Nov 2010 14:24:52 +0100 Subject: [PATCH 03/14] Upstream 2010o --- sources | 2 +- tzdata.spec | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sources b/sources index d9d3a08..d7e4634 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -b5eefb4986866895ab84f52220f1dfa6 tzdata2010n.tar.gz a7a776a5713831993e814fe0c05f9fd5 tzcode2010n.tar.gz +5cae5c56fad81dc29f8fcd933a05768e tzdata2010o.tar.gz diff --git a/tzdata.spec b/tzdata.spec index de951ae..b23aed6 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,7 +1,7 @@ Summary: Timezone data Name: tzdata -Version: 2010n -%define tzdata_version 2010n +Version: 2010o +%define tzdata_version 2010o %define tzcode_version 2010n Release: 1%{?dist} License: Public Domain @@ -111,6 +111,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Tue Nov 09 2010 Petr Machata - 2010o-1 +- Upstream 2010o: + - Fiji will end DST on March 6, 2011, not March 27, 2011 + * Wed Oct 27 2010 Petr Machata - 2010n-1 - Upstream 2010m: - Hong Kong didn't observe DST in 1977 @@ -120,7 +124,6 @@ rm -rf %{buildroot} - Change end of DST in Samoa in 2011 from 2011-04-03 0:00 to 2011-04-03 1:00 - * Mon Aug 16 2010 Petr Machata - 2010l-2 - Upstream 2010l: - Change Cairo's 2010 reversion to DST from the midnight between From 3c4325a08133d19cc4708472905b0ec971a1f662 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Wed, 9 Feb 2011 13:12:14 +0100 Subject: [PATCH 04/14] Upstream 2011b - America/North_Dakota/Beulah: Mercer County, North Dakota, changed from the mountain time zone to the central time zone --- sources | 4 ++-- tzdata.spec | 11 ++++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 076e42c..1d8dadd 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2 -d60f168fb7307d8c1b926c7dc3a6c5c1 tzdata2011a.tar.gz -001db5591974e6db7797a90cbdcbbadc tzcode2011a.tar.gz +9eaf3ca354c42a32bd28e623539bf0e0 tzdata2011b.tar.gz +c63a1425f7252aef1fe54a258cdccff8 tzcode2011b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index 9b8448c..9dbb1fd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2011a -%define tzdata_version 2011a -%define tzcode_version 2011a +Version: 2011b +%define tzdata_version 2011b +%define tzcode_version 2011b Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -111,6 +111,11 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Wed Feb 09 2011 Petr Machata - 2011b-1 +- Upstream 2011b: + - America/North_Dakota/Beulah: Mercer County, North Dakota, changed + from the mountain time zone to the central time zone + * Mon Jan 24 2011 Petr Machata - 2011a-1 - Upstream 2011a: - Updates of historical stamps for Hawaii From 15a238a46e6491d3930efe4216fffaf296ab0e35 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 3 Mar 2011 23:32:10 +0100 Subject: [PATCH 05/14] Add tentative 2011c for Chile change - 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 dfaac61..1374d86 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,5 @@ tzdata2010l.tar.gz /tzdata2010o.tar.gz /tzdata2011a.tar.gz /tzcode2011a.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 9dbb1fd..aed5a0e 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2011b
 %define tzdata_version 2011b
 %define tzcode_version 2011b
-Release: 1%{?dist}
+Release: 2%{?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-2
+- 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-2011b-c.patch)
+
 * Wed Feb 09 2011 Petr Machata  - 2011b-1
 - Upstream 2011b:
   - America/North_Dakota/Beulah: Mercer County, North Dakota, changed

From b59a1b09d251af1cbf6e212de24913f738939e95 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:18:38 +0100
Subject: [PATCH 06/14] Kemerovo oblast should use OMST/OMSST abbreviation

---
 tzdata-2011b-kemerovo.patch | 14 ++++++++++++++
 tzdata.spec                 |  7 ++++++-
 2 files changed, 20 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 aed5a0e..4478068 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/
@@ -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,9 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Fri Mar 04 2011 Petr Machata  - 2011b-3
+- Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
+
 * Thu Mar 03 2011 Petr Machata  - 2011b-2
 - Update of historical stamps for Juneau, Sitka, and histcurrent stamps
   for Metlakatla.  Sitka and Metlakatla are new zones.

From e32ddc25e663e554a7ac01125acbda6311dbef7f Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:44:21 +0100
Subject: [PATCH 07/14] 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                                   |  19 +-
 4 files changed, 16 insertions(+), 314 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 4478068..ee78422 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: 3%{?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,6 +113,13 @@ 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-3
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 

From d415976b888074fecbd834d43fc4a4f91dd0a635 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 16:41:16 +0200
Subject: [PATCH 08/14] 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 ee78422..3fca4a9 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 6f82283cc9c3be8a07429416445d10c5873cf6c9 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:58:36 +0200
Subject: [PATCH 09/14] 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 3fca4a9..a0dad95 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 2bd394b1041e03fa6bca4d897921b2bb7c70d485 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:33:07 +0200
Subject: [PATCH 10/14] 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..b44920f 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
+a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
+ecb564279b28c5b184421c525d997d6c  tzcode2011g.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 a0dad95..83efe90 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 e9c65d9121c218a3a48a80856d16e7ce39a628f0 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 10 Aug 2011 22:46:34 +0200
Subject: [PATCH 11/14] 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 7c9c66a..cea04fe 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 7756f9e5a88116182c333ba4837b59e309ee3c38 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:02:00 +0200
Subject: [PATCH 12/14] 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 cea04fe..22562d3 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 c059127ca83828a969494494573bf4b59d280966 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 30 Aug 2011 02:45:58 +0200
Subject: [PATCH 13/14] 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 22562d3..d0a515b 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 fecaadd1794376239ab132a56abb355d508c369f Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 11 Oct 2011 16:29:34 +0200
Subject: [PATCH 14/14] Upstream 2011l:

- Fix ancient stamps for America/Sitka
- Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
- Fiji will introduce DST on Oct 22
---
 .gitignore                                    |   1 +
 sources                                       |   2 +-
 tzdata-2011j-k.patch                          | 451 ------------------
 ...erovo.patch => tzdata-2011l-kemerovo.patch |   4 +-
 tzdata.spec                                   |  16 +-
 5 files changed, 14 insertions(+), 460 deletions(-)
 delete mode 100644 tzdata-2011j-k.patch
 rename tzdata-2011j-kemerovo.patch => tzdata-2011l-kemerovo.patch (81%)

diff --git a/.gitignore b/.gitignore
index ff3ccb8..025ac80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -67,3 +67,4 @@ noarch/
 /tzdata2011i.tar.gz
 /tzcode2011i.tar.gz
 /tzdata2011j.tar.gz
+/tzdata2011l.tar.gz
diff --git a/sources b/sources
index c38fd86..38f7a00 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
 cf7f4335b7c8682899fa2814e711c1b2  tzcode2011i.tar.gz
-30a6bebdbdd03c5bd29241c15f569d50  tzdata2011j.tar.gz
+bae1b93673e1aef80186c90dfd493f1c  tzdata2011l.tar.gz
diff --git a/tzdata-2011j-k.patch b/tzdata-2011j-k.patch
deleted file mode 100644
index c4341b2..0000000
--- a/tzdata-2011j-k.patch
+++ /dev/null
@@ -1,451 +0,0 @@
-diff -r -c old/asia new/asia
-*** tzdata2011j/asia	Sat Sep  3 08:28:37 2011
---- tzdata2011k/asia	Tue Sep 20 17:54:03 2011
-***************
-*** 1,4 ****
-! # @(#)asia	8.65
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,4 ----
-! # @(#)asia	8.68
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 2194,2200 ****
---- 2194,2230 ----
-  # http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
-  # 
-  
-+ # From Steffen Thorsen (2011-08-26):
-+ # Gaza and the West Bank did go back to standard time in the beginning of
-+ # August, and will now enter daylight saving time again on 2011-08-30
-+ # 00:00 (so two periods of DST in 2011). The pause was because of
-+ # Ramadan.
-+ #
-+ # 
-+ # http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
-+ # 
-+ # Additional info:
-+ # 
-+ # http://www.timeanddate.com/news/time/palestine-dst-2011.html
-+ # 
-+ 
-+ # From Alexander Krivenyshev (2011-08-27):
-+ # According to the article in The Jerusalem Post:
-+ # "...Earlier this month, the Palestinian government in the West Bank decided to
-+ # move to standard time for 30 days, during Ramadan. The Palestinians in the
-+ # Gaza Strip accepted the change and also moved their clocks one hour back.
-+ # The Hamas government said on Saturday that it won't observe summertime after
-+ # the Muslim feast of Id al-Fitr, which begins on Tuesday..."
-+ # ...
-+ # 
-+ # http://www.jpost.com/MiddleEast/Article.aspx?id=235650
-+ # 
-+ # or
-+ # 
-+ # http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
-+ # 
-  # The rules for Egypt are stolen from the `africa' file.
-+ 
-  # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-  Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-  Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-***************
-*** 2210,2221 ****
-  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-! Rule Palestine	2008	only	-	Aug	lastFri	2:00	0	-
-  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-! Rule Palestine	2010	max	-	Mar	lastSat	0:01	1:00	S
-! Rule Palestine	2009	max	-	Sep	Fri>=1	2:00	0	-
-  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-  
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-  			2:00	Zion	EET	1948 May 15
---- 2240,2254 ----
-  Rule Palestine	2006	2008	-	Apr	 1	0:00	1:00	S
-  Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-  Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-! Rule Palestine	2008	only	-	Aug	lastFri	0:00	0	-
-  Rule Palestine	2009	only	-	Mar	lastFri	0:00	1:00	S
-! Rule Palestine	2009	only	-	Sep	Fri>=1	2:00	0	-
-! Rule Palestine	2010	only	-	Mar	lastSat	0:01	1:00	S
-  Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-  
-+ # From Arthur David Olson (2011-09-20):
-+ # 2011 transitions per http://www.timeanddate.com as of 2011-09-20.
-+ 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-  			2:00	Zion	EET	1948 May 15
-***************
-*** 2222,2229 ****
-  			2:00 EgyptAsia	EE%sT	1967 Jun  5
-  			2:00	Zion	I%sT	1996
-  			2:00	Jordan	EE%sT	1999
-! 			2:00 Palestine	EE%sT
-  
-  # Paracel Is
-  # no information
-  
---- 2255,2277 ----
-  			2:00 EgyptAsia	EE%sT	1967 Jun  5
-  			2:00	Zion	I%sT	1996
-  			2:00	Jordan	EE%sT	1999
-! 			2:00 Palestine	EE%sT	2011 Apr  2 12:01
-! 			2:00	1:00	EEST	2011 Aug  1
-! 			2:00	-	EET
-  
-+ Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
-+ 			2:00	Zion	EET	1948 May 15
-+ 			2:00 EgyptAsia	EE%sT	1967 Jun  5
-+ 			2:00	Zion	I%sT	1996
-+ 			2:00	Jordan	EE%sT	1999
-+ 			2:00 Palestine	EE%sT	2008 Aug
-+ 			2:00 	1:00	EEST	2008 Sep
-+ 			2:00 Palestine	EE%sT	2011 Apr  1 12:01
-+ 			2:00	1:00	EEST	2011 Aug  1
-+ 			2:00	-	EET	2011 Aug 30
-+ 			2:00	1:00	EEST	2011 Oct  3 3:00
-+ 			2:00	-	EET
-+ 
-  # Paracel Is
-  # no information
-  
-diff -r -c old/europe new/europe
-*** tzdata2011j/europe	Wed Aug 17 12:52:01 2011
---- tzdata2011k/europe	Tue Sep 20 17:44:59 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)europe	8.34
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)europe	8.38
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 561,569 ****
-  #
-  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-! Rule	Russia	1993	max	-	Mar	lastSun	 2:00s	1:00	S
-  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-! Rule	Russia	1996	max	-	Oct	lastSun	 2:00s	0	-
-  
-  # From Alexander Krivenyshev (2011-06-14):
-  # According to Kremlin press service, Russian President Dmitry Medvedev
---- 561,569 ----
-  #
-  Rule	Russia	1992	only	-	Mar	lastSat	 23:00	1:00	S
-  Rule	Russia	1992	only	-	Sep	lastSat	 23:00	0	-
-! Rule	Russia	1993	2010	-	Mar	lastSun	 2:00s	1:00	S
-  Rule	Russia	1993	1995	-	Sep	lastSun	 2:00s	0	-
-! Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
-  
-  # From Alexander Krivenyshev (2011-06-14):
-  # According to Kremlin press service, Russian President Dmitry Medvedev
-***************
-*** 583,589 ****
-  # From Arthur David Olson (2011-06-15):
-  # Take "abolishing daylight saving time" to mean that time is now considered
-  # to be standard.
-- # At least for now, keep the "old" Russia rules for the benefit of Belarus.
-  
-  # These are for backward compatibility with older versions.
-  
---- 583,588 ----
-***************
-*** 689,694 ****
---- 688,710 ----
-  			1:00	EU	CE%sT
-  
-  # Belarus
-+ # From Yauhen Kharuzhy (2011-09-16):
-+ # By latest Belarus government act Europe/Minsk timezone was changed to
-+ # GMT+3 without DST (was GMT+2 with DST).
-+ #
-+ # Sources (Russian language):
-+ # 1.
-+ # 
-+ # http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
-+ # 
-+ # 2.
-+ # 
-+ # http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
-+ # 
-+ # 3.
-+ # 
-+ # http://news.tut.by/society/250578.html
-+ # 
-  # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-  Zone	Europe/Minsk	1:50:16 -	LMT	1880
-  			1:50	-	MMT	1924 May 2 # Minsk Mean Time
-***************
-*** 700,706 ****
-  			2:00	1:00	EEST	1991 Sep 29 2:00s
-  			2:00	-	EET	1992 Mar 29 0:00s
-  			2:00	1:00	EEST	1992 Sep 27 0:00s
-! 			2:00	Russia	EE%sT
-  
-  # Belgium
-  #
---- 716,723 ----
-  			2:00	1:00	EEST	1991 Sep 29 2:00s
-  			2:00	-	EET	1992 Mar 29 0:00s
-  			2:00	1:00	EEST	1992 Sep 27 0:00s
-! 			2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			3:00	-	FET # Further-eastern European Time
-  
-  # Belgium
-  #
-***************
-*** 2034,2040 ****
-  			 2:00	Poland	CE%sT	1946
-  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
-  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			 3:00	-	KALT
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Adygeya, Arkhangel'skaya oblast',
---- 2051,2057 ----
-  			 2:00	Poland	CE%sT	1946
-  			 3:00	Russia	MSK/MSD	1991 Mar 31 2:00s
-  			 2:00	Russia	EE%sT	2011 Mar 27 2:00s
-! 			 3:00	-	FET # Further-eastern European Time
-  #
-  # From Oscar van Vlijmen (2001-08-25): [This region consists of]
-  # Respublika Adygeya, Arkhangel'skaya oblast',
-***************
-*** 2189,2195 ****
-  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
-  
-  # From Oscar van Vlijmen (2009-11-29):
-! # ...some regions of RUssia were merged with others since 2005...
-  # Some names were changed, no big deal, except for one instance: a new name.
-  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
-  
---- 2206,2212 ----
-  # [parts of] Respublika Sakha (Yakutiya), Chitinskaya oblast'.
-  
-  # From Oscar van Vlijmen (2009-11-29):
-! # ...some regions of [Russia] were merged with others since 2005...
-  # Some names were changed, no big deal, except for one instance: a new name.
-  # YAK/YAKST: UTC+9 Zabajkal'skij kraj.
-  
-***************
-*** 2613,2618 ****
---- 2630,2657 ----
-  # 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,2632 ****
-  			3:00	-	MSK	1990 Jul  1 2:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT
-  # Ruthenia used CET 1990/1991.
-  # "Uzhhorod" is the transliteration of the Ukrainian name, but
-  # "Uzhgorod" is more common in English.
---- 2665,2672 ----
-  			3:00	-	MSK	1990 Jul  1 2:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			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,2646 ****
-  			1:00	-	CET	1991 Mar 31 3:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			2:00	EU	EE%sT
-  # 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
---- 2680,2687 ----
-  			1:00	-	CET	1991 Mar 31 3:00
-  			2:00	-	EET	1992
-  			2:00	E-Eur	EE%sT	1995
-! 			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,2659 ****
-  			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
-  # Central Crimea used Moscow time 1994/1997.
-  Zone Europe/Simferopol	2:16:24 -	LMT	1880
-  			2:16	-	SMT	1924 May  2 # Simferopol Mean T
---- 2694,2701 ----
-  			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	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,2684 ****
-  # 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
-  
-  ###############################################################################
-  
---- 2720,2727 ----
-  # 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	2011 Mar lastSun 1:00u
-! 			3:00	-	FET # Further-eastern European Time
-  
-  ###############################################################################
-  
-diff -r -c old/northamerica new/northamerica
-*** tzdata2011j/northamerica	Wed Aug 17 17:33:36 2011
---- tzdata2011k/northamerica	Tue Sep 20 13:55:04 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)northamerica	8.48
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
---- 1,5 ----
-  # 
    -! # @(#)northamerica	8.49
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  
-***************
-*** 1168,1198 ****
-  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
-  # at 00:01 local time.  For now, assume it started in 1987.
-  
-! # From Michael Pelley (2011-08-05):
-! # The Government of Newfoundland and Labrador has pending changes to
-! # modify the hour for daylight savings time to come into effect in
-! # November 2011. This modification would change the time from 12:01AM to
-! # 2:00AM on the dates of the switches of Daylight Savings Time to/from
-! # Standard Time.
-! #
-! # As a matter of reference, in Canada provinces have the authority of
-! # setting time zone information. The legislation has passed our
-! # legislative body (The House of Assembly) and is awaiting the
-! # proclamation to come into effect. You may find this information at:
-! # 
-! # http://www.assembly.nl.ca/legislation/sr/lists/Proclamation.htm
-  # 
-- # and
-- # search within that web page for Standard Time (Amendment) Act. The Act
-- # may be found at:
-- # 
-- # http://www.assembly.nl.ca/business/bills/Bill1106.htm
-- # 
-  # ...
-! # MICHAEL PELLEY | Manager of Enterprise Architecture - Solution Delivery
-! # Office of the Chief Information Officer Executive Council Government of
-! # Newfoundland & Labrador P.O. Box 8700, 40 Higgins Line, St. John's NL
-! # A1B 4J6
-  
-  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
---- 1168,1188 ----
-  # INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
-  # at 00:01 local time.  For now, assume it started in 1987.
-  
-! # From Michael Pelley (2011-09-12):
-! # We received today, Monday, September 12, 2011, notification that the
-! # changes to the Newfoundland Standard Time Act have been proclaimed.
-! # The change in the Act stipulates that the change from Daylight Savings
-! # Time to Standard Time and from Standard Time to Daylight Savings Time
-! # now occurs at 2:00AM.
-! # ...
-! # 
-! # http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
-  # 
-  # ...
-! # MICHAEL PELLEY  |  Manager of Enterprise Architecture - Solution Delivery
-! # Office of the Chief Information Officer
-! # Executive Council
-! # Government of Newfoundland & Labrador
-  
-  Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-  Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
-diff -r -c old/zone.tab new/zone.tab
-*** tzdata2011j/zone.tab	Wed Aug 17 13:36:43 2011
---- tzdata2011k/zone.tab	Tue Sep 20 17:37:30 2011
-***************
-*** 1,5 ****
-  # 
    -! # @(#)zone.tab	8.47
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
---- 1,5 ----
-  # 
    -! # @(#)zone.tab	8.49
-  # This file is in the public domain, so clarified as of
-  # 2009-05-17 by Arthur David Olson.
-  #
-***************
-*** 319,325 ****
-  PM	+4703-05620	America/Miquelon
-  PN	-2504-13005	Pacific/Pitcairn
-  PR	+182806-0660622	America/Puerto_Rico
-! PS	+3130+03428	Asia/Gaza
-  PT	+3843-00908	Europe/Lisbon	mainland
-  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-  PT	+3744-02540	Atlantic/Azores	Azores
---- 319,326 ----
-  PM	+4703-05620	America/Miquelon
-  PN	-2504-13005	Pacific/Pitcairn
-  PR	+182806-0660622	America/Puerto_Rico
-! PS	+3130+03428	Asia/Gaza	Gaza Strip
-! PS	+313200+0350542	Asia/Hebron	West Bank
-  PT	+3843-00908	Europe/Lisbon	mainland
-  PT	+3238-01654	Atlantic/Madeira	Madeira Islands
-  PT	+3744-02540	Atlantic/Azores	Azores
diff --git a/tzdata-2011j-kemerovo.patch b/tzdata-2011l-kemerovo.patch
similarity index 81%
rename from tzdata-2011j-kemerovo.patch
rename to tzdata-2011l-kemerovo.patch
index bd515ad..17a44e6 100644
--- a/tzdata-2011j-kemerovo.patch
+++ b/tzdata-2011l-kemerovo.patch
@@ -1,6 +1,6 @@
 diff -up tzdata2011h/europe\~ tzdata2011h/europe
---- tzdata2011j/europe~	2011-06-15 13:31:00.000000000 +0200
-+++ tzdata2011j/europe	2011-06-27 16:49:39.323493224 +0200
+--- tzdata2011l/europe~	2011-06-15 13:31:00.000000000 +0200
++++ tzdata2011l/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 f3a4c2f..c707f2d 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011k
-%define tzdata_version 2011j
+Version: 2011l
+%define tzdata_version 2011l
 %define tzcode_version 2011i
-Release: 0.1.20110921%{?dist}
+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-2011j-kemerovo.patch
-Patch2: tzdata-2011j-k.patch
+Patch1: tzdata-2011l-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,12 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Oct 11 2011 Petr Machata  - 2011l-1
+- Upstream 2011l:
+  - Fix ancient stamps for America/Sitka
+  - Asia/Hebron transitioned to standard time already on Sep 30, not Oct 3
+  - Fiji will introduce DST on Oct 22
+
 * Wed Sep 21 2011 Petr Machata  - 2011k-0.1.20110921
 - Upstream 2011j:
   - Fix the Samoa date line skip