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