From 6b4b305dbfc716a3093eed03b6c2451382350974 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Mar 13 2013 15:24:33 +0000 Subject: Upstream 2013b --- diff --git a/.gitignore b/.gitignore index 77324b4..3787200 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,5 @@ noarch/ /tzcode2012i.tar.gz /tzdata2012j.tar.gz /tzcode2012j.tar.gz +/tzdata2013b.tar.gz +/tzcode2013b.tar.gz diff --git a/0016-Chile-is-changing-its-DST-rules.patch b/0016-Chile-is-changing-its-DST-rules.patch deleted file mode 100644 index 2869dc5..0000000 --- a/0016-Chile-is-changing-its-DST-rules.patch +++ /dev/null @@ -1,70 +0,0 @@ -From cec2e7019a42e7b154b3e78993d8716d33ca6062 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Wed, 20 Feb 2013 23:40:23 -0800 -Subject: [PATCH 16/16] Chile is changing its DST rules. - -Thanks to Steffen Thorsen for the heads-up, in -. -* antarctica (ChileAQ): -* southamerica (Chile): -Assume the 2012 rules will continue indefinitely. Suggested by Robert -Elz in . ---- - antarctica | 6 ++---- - southamerica | 16 +++++++++------- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/antarctica b/antarctica -index f55cbde..d55924b 100644 ---- a/antarctica -+++ b/antarctica -@@ -50,10 +50,8 @@ Rule ChileAQ 2009 only - Mar Sun>=9 3:00u 0 - - Rule ChileAQ 2010 only - Apr Sun>=1 3:00u 0 - - Rule ChileAQ 2011 only - May Sun>=2 3:00u 0 - - Rule ChileAQ 2011 only - Aug Sun>=16 4:00u 1:00 S --Rule ChileAQ 2012 only - Apr Sun>=23 3:00u 0 - --Rule ChileAQ 2012 only - Sep Sun>=2 4:00u 1:00 S --Rule ChileAQ 2013 max - Mar Sun>=9 3:00u 0 - --Rule ChileAQ 2013 max - Oct Sun>=9 4:00u 1:00 S -+Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - -+Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S - - # These rules are stolen from the `australasia' file. - Rule AusAQ 1917 only - Jan 1 0:01 1:00 - -diff --git a/southamerica b/southamerica -index 671d09b..f77142e 100644 ---- a/southamerica -+++ b/southamerica -@@ -1240,9 +1240,13 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 - # b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is, - # at 23:59:59, instead of passing to 0:00, the time should be adjusted to be - # 01:00 on September 2. --# --# Note that...this is yet another "temporary" change that will be reevaluated --# AGAIN in 2013. -+ -+# From Steffen Thorsen (2013-02-15): -+# According to several news sources, Chile has extended DST this year, -+# they will end DST later and start DST earlier than planned. They -+# hope to save energy. The new end date is 2013-04-28 00:00 and new -+# start date is 2013-09-08 00:00.... -+# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm - - # NOTE: ChileAQ rules for Antarctic bases are stored separately in the - # 'antarctica' file. -@@ -1285,10 +1289,8 @@ Rule Chile 2009 only - Mar Sun>=9 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 only - Apr Sun>=23 3:00u 0 - --Rule Chile 2012 only - Sep Sun>=2 4:00u 1:00 S --Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - --Rule Chile 2013 max - Oct Sun>=9 4:00u 1:00 S -+Rule Chile 2012 max - Apr Sun>=23 3:00u 0 - -+Rule Chile 2012 max - Sep Sun>=2 4:00u 1:00 S - # IATA SSIM anomalies: (1992-02) says 1992-03-14; - # (1996-09) says 1998-03-08. Ignore these. - # Zone NAME GMTOFF RULES FORMAT [UNTIL] --- -1.7.6.5 - diff --git a/sources b/sources index 6aebfa9..4783f42 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ 6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz -ba2f92ae7ad099090e8f86cff2f2d799 tzdata2012j.tar.gz -868b5d0dbf0e115ae4eb39a932ad0c4c tzcode2012j.tar.gz +489dbca77d1f2e287a3987ca047bb246 tzdata2013b.tar.gz +c8bb91ce60092ef61d628d104ad3dab1 tzcode2013b.tar.gz diff --git a/tzdata.spec b/tzdata.spec index ba07fde..a6387a5 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,16 +1,15 @@ Summary: Timezone data Name: tzdata -Version: 2012j -%define tzdata_version 2012j -%define tzcode_version 2012j -Release: 3%{?dist} +Version: 2013b +%define tzdata_version 2013b +%define tzcode_version 2013b +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz # __decl_patches -Patch0: 0016-Chile-is-changing-its-DST-rules.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -38,7 +37,6 @@ This package contains timezone information for use by Java runtimes. %setup -q -c -a 1 # __apply_patches -%patch0 -p1 # __end mkdir javazic @@ -100,6 +98,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi %changelog +* Wed Mar 13 2013 Petr Machata - 2013b-1 +- Upstream 2013b + - Paraguay will end DST on March 24 this year + - Haiti uses US daylight-saving rules this year + - Morocco does not observe DST during Ramadan +- Upstream 2013a + - Retire Chile patch, 2013a has the data + - New Zones Asia/Khandyga, Asia/Ust-Nera, Europe/Busingen + - Many changes in historical timestamps + * Wed Feb 27 2013 Petr Machata - 2012j-3 - DTS in Chile will end on 2013-04-28 (0016-Chile-is-changing-its-DST-rules.patch)