From e32ddc25e663e554a7ac01125acbda6311dbef7f Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mar 15 2011 09:44:21 +0000 Subject: 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. --- 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-2011b-kemerovo.patch
deleted file mode 100644
index 2310c6e..0000000
--- a/tzdata-2011b-kemerovo.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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-2011d-kemerovo.patch b/tzdata-2011d-kemerovo.patch
new file mode 100644
index 0000000..7c4fecd
--- /dev/null
+++ b/tzdata-2011d-kemerovo.patch
@@ -0,0 +1,14 @@
+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
+@@ -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 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)