From 1a3768ffd3b82944bf3a844373dbe02c6b707f1c Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Thu, 3 Mar 2011 23:16:15 +0100 Subject: [PATCH 1/9] 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 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 b8b904a..59432ee 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-2010b-c.patch)
+
 * Wed Feb 09 2011 Petr Machata  - 2011b-1
 - Upstream 2011b:
   - America/North_Dakota/Beulah: Mercer County, North Dakota, changed

From 5adc732cca25b69b2b01fd088cdcb9eab677499e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Fri, 4 Mar 2011 00:17:39 +0100
Subject: [PATCH 2/9] 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 fb3f34e..168d909 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,9 @@ 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 a6ebaa9169bdba00ea0dc6c768ccf974ef53f9cf Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 15 Mar 2011 10:40:05 +0100
Subject: [PATCH 3/9] 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.
---
 .gitignore                                    |   2 +
 sources                                       |   4 +-
 tzdata-2011b-c.patch                          | 303 ------------------
 ...erovo.patch => tzdata-2011d-kemerovo.patch |   4 +-
 tzdata.spec                                   |  19 +-
 5 files changed, 18 insertions(+), 314 deletions(-)
 delete mode 100644 tzdata-2011b-c.patch
 rename tzdata-2011b-kemerovo.patch => tzdata-2011d-kemerovo.patch (79%)

diff --git a/.gitignore b/.gitignore
index c031c4a..43b23e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,3 +55,5 @@ tzdata2010l.tar.gz
 /tzcode2011b.tar.gz
 tzdata/
 *.rpm
+/tzdata2011d.tar.gz
+/tzcode2011d.tar.gz
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 168d909..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,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-4
 - Kemerovo oblast should use OMST/OMSST abbreviation (tzdata-2011b-kemerovo.patch)
 

From c45cecdd0c2e5095893500b009743d595c63dbb7 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 29 Mar 2011 13:36:28 +0200
Subject: [PATCH 4/9] 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 e7a5415a41d0c7159e7ddd6420c3f07bd4f62c8e Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 30 Mar 2011 17:57:55 +0200
Subject: [PATCH 5/9] 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 1520870880e3191369e69f3d5da4421da668a316 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 20 Apr 2011 13:08:49 +0200
Subject: [PATCH 6/9] Update to 2011f

- Upstream 2011e:
  - Canonical version of Chile and Morocco changes
- Upstream 2011f:
  - The Falkland Islands will not turn back clocks this winter, but
    stay on daylight saving time
- Resolves: #696587
---
 .gitignore                                    |  1 +
 sources                                       |  2 +-
 tzdata-2011d-chile.patch                      | 19 ----------------
 tzdata-2011d-morocco.patch                    | 15 -------------
 ...erovo.patch => tzdata-2011f-kemerovo.patch |  4 ++--
 tzdata.spec                                   | 22 +++++++++++--------
 6 files changed, 17 insertions(+), 46 deletions(-)
 delete mode 100644 tzdata-2011d-chile.patch
 delete mode 100644 tzdata-2011d-morocco.patch
 rename tzdata-2011d-kemerovo.patch => tzdata-2011f-kemerovo.patch (79%)

diff --git a/.gitignore b/.gitignore
index 43b23e1..7d33bd2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -57,3 +57,4 @@ tzdata/
 *.rpm
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
+/tzdata2011f.tar.gz
diff --git a/sources b/sources
index 4e8ee12..2b3688a 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
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-2011f-kemerovo.patch
similarity index 79%
rename from tzdata-2011d-kemerovo.patch
rename to tzdata-2011f-kemerovo.patch
index 7c4fecd..0abe4b8 100644
--- a/tzdata-2011d-kemerovo.patch
+++ b/tzdata-2011f-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
+--- tzdata2011f/europe~	2010-12-16 18:24:20.000000000 +0100
++++ tzdata2011f/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..8c02056 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: 2011f
+%define tzdata_version 2011f
+%define tzcode_version 2011e
+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-2011f-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,14 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Wed Apr 20 2011 Petr Machata  - 2011f-1
+- Upstream 2011e:
+  - Canonical version of Chile and Morocco changes
+- Upstream 2011f:
+  - The Falkland Islands will not turn back clocks this winter, but
+    stay on daylight saving time
+- Resolves: #696587
+
 * Wed Mar 30 2011 Petr Machata  - 2011d-3
 - Morocco introduced DST for 2011 from April 2 to July 31. (tzdata-2011d-morocco.patch)
 

From 00358245b284a9addf23fd28e18dd50d97876737 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Wed, 20 Apr 2011 13:20:47 +0200
Subject: [PATCH 7/9] Commit tzcode2011e

---
 .gitignore | 1 +
 sources    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7d33bd2..611a385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@ tzdata/
 /tzdata2011d.tar.gz
 /tzcode2011d.tar.gz
 /tzdata2011f.tar.gz
+/tzcode2011e.tar.gz
diff --git a/sources b/sources
index 2b3688a..ff93047 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-95095242ee368e6a7e107f154590ac11  tzcode2011d.tar.gz
 cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+fbfc05dbf9ebcfe7c4bba18549870173  tzcode2011e.tar.gz

From 3c1d1802e6a742d0e5a1d851a3979d11c7da2975 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Tue, 26 Apr 2011 15:25:46 +0200
Subject: [PATCH 8/9] - Upstream 2011g:   - Egypt abandons DST in 2011 (and
 forward)

---
 .gitignore                                           |  4 ++++
 sources                                              |  4 ++--
 ...11f-kemerovo.patch => tzdata-2011g-kemerovo.patch |  6 +++---
 tzdata.spec                                          | 12 ++++++++----
 4 files changed, 17 insertions(+), 9 deletions(-)
 rename tzdata-2011f-kemerovo.patch => tzdata-2011g-kemerovo.patch (71%)

diff --git a/.gitignore b/.gitignore
index 611a385..1ef6dc7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -59,3 +59,7 @@ tzdata/
 /tzcode2011d.tar.gz
 /tzdata2011f.tar.gz
 /tzcode2011e.tar.gz
+/tzdata2011g.tar.gz
+/tzcode2011g.tar.gz
+noarch/
+.build-*
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
diff --git a/tzdata-2011f-kemerovo.patch b/tzdata-2011g-kemerovo.patch
similarity index 71%
rename from tzdata-2011f-kemerovo.patch
rename to tzdata-2011g-kemerovo.patch
index 0abe4b8..a590c4f 100644
--- a/tzdata-2011f-kemerovo.patch
+++ b/tzdata-2011g-kemerovo.patch
@@ -1,6 +1,6 @@
-diff -up tzdata2011b/europe\~ tzdata2011b/europe
---- tzdata2011f/europe~	2010-12-16 18:24:20.000000000 +0100
-+++ tzdata2011f/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 8c02056..3f13e07 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011f
-%define tzdata_version 2011f
-%define tzcode_version 2011e
+Version: 2011g
+%define tzdata_version 2011g
+%define tzcode_version 2011g
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -17,7 +17,7 @@ Source0: tzdata-base-0.tar.bz2
 Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz
 Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz
 # __decl_patches
-Patch1: tzdata-2011f-kemerovo.patch
+Patch1: tzdata-2011g-kemerovo.patch
 # __end
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -113,6 +113,10 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Tue Apr 26 2011 Petr Machata  - 2011g-1
+- Upstream 2011g:
+  - Egypt abandons DST in 2011 (and forward)
+
 * Wed Apr 20 2011 Petr Machata  - 2011f-1
 - Upstream 2011e:
   - Canonical version of Chile and Morocco changes

From 87f47eac61d9bb48619d85962f1b4f614ab83547 Mon Sep 17 00:00:00 2001
From: Petr Machata 
Date: Mon, 27 Jun 2011 16:44:04 +0200
Subject: [PATCH 9/9] Upstream 2011h:   - Russia abandons DST in 2011.   -
 *.tab: change AN (Netherlands Antilles) to CW (Curacao)

---
 .gitignore  | 1 +
 sources     | 2 +-
 tzdata.spec | 9 +++++++--
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1ef6dc7..40cf432 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,3 +63,4 @@ tzdata/
 /tzcode2011g.tar.gz
 noarch/
 .build-*
+/tzdata2011h.tar.gz
diff --git a/sources b/sources
index b44920f..4d14f09 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 6a3392cd5f1594d13c12c1a836ac8d91  javazic.tar.gz
 e36d2f742c22f8c8dbf0686ac9769b55  tzdata-base-0.tar.bz2
-a068c27e7e426fdb12ab0c88506df20d  tzdata2011g.tar.gz
 ecb564279b28c5b184421c525d997d6c  tzcode2011g.tar.gz
+546d27b6c1e5e1097bd512651815017f  tzdata2011h.tar.gz
diff --git a/tzdata.spec b/tzdata.spec
index 3f13e07..f05dd88 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2011g
+Version: 2011h
 %define tzdata_version 2011g
-%define tzcode_version 2011g
+%define tzcode_version 2011h
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -113,6 +113,11 @@ rm -rf %{buildroot}
 %{_datadir}/javazi
 
 %changelog
+* Mon Jun 27 2011 Petr Machata  - 2011h-1
+- Upstream 2011h:
+  - Russia abandons DST in 2011.
+  - *.tab: change AN (Netherlands Antilles) to CW (Curacao)
+
 * Tue Apr 26 2011 Petr Machata  - 2011g-1
 - Upstream 2011g:
   - Egypt abandons DST in 2011 (and forward)