From 7756f9e5a88116182c333ba4837b59e309ee3c38 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Tue, 30 Aug 2011 02:02:00 +0200 Subject: [PATCH] 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.