From 66f71842e975d5a8391df81c5fde8398e8db47f8 Mon Sep 17 00:00:00 2001 From: Petr Machata Date: Fri, 24 Feb 2012 13:44:13 +0100 Subject: [PATCH] Add a patch for change in Chilean DST --- tzdata-2011n-chile.patch | 43 ++++++++++++++++++++++++++++++++++++++++ tzdata.spec | 17 ++++++++++++---- 2 files changed, 56 insertions(+), 4 deletions(-) create mode 100644 tzdata-2011n-chile.patch diff --git a/tzdata-2011n-chile.patch b/tzdata-2011n-chile.patch new file mode 100644 index 0000000..c76be8c --- /dev/null +++ b/tzdata-2011n-chile.patch @@ -0,0 +1,43 @@ +--- southamerica.orig 2012-02-23 10:18:06.000000000 -0300 ++++ southamerica 2012-02-23 10:47:39.000000000 -0300 +@@ -1219,4 +1219,24 @@ + # which will be reevaluated in 2012. + ++# From Mauricio Parada ++# [edited by Glenn Eychaner ] ++# ++# As stated in the website of the Chilean Energy Ministry ++# ++# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html ++# ++# The Chilean Government has decided to postpone the entrance into winter time ++# (to leave DST) from March 11 2012 to April 28th 2012. The decision has not ++# been yet formalized but it will within the next days. ++# Quote from the website communication: ++# ++# 6. For the year 2012, the dates of entry into winter time will be as follows: ++# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at ++# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00 ++# of the same day. ++# 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. ++ + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Chile 1927 1932 - Sep 1 0:00 1:00 S +@@ -1250,5 +1270,6 @@ + Rule Chile 1999 2010 - Oct Sun>=9 4:00u 1:00 S + 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 only - Sep 2 4:00u 1:00 S ++Rule Chile 2013 max - 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, +@@ -1258,5 +1279,6 @@ + Rule Chile 2010 only - Apr Sun>=1 3:00u 0 - + Rule Chile 2011 only - May Sun>=2 3:00u 0 - +-Rule Chile 2012 max - Mar Sun>=9 3:00u 0 - ++Rule Chile 2012 only - Apr 29 3:00u 0 - ++Rule Chile 2013 max - Mar Sun>=9 3:00u 0 - + # IATA SSIM anomalies: (1992-02) says 1992-03-14; + # (1996-09) says 1998-03-08. Ignore these. diff --git a/tzdata.spec b/tzdata.spec index dacd5a2..9677d08 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2011n %define tzdata_version 2011n %define tzcode_version 2011i -Release: 3%{?dist} +Release: 4%{?dist} License: Public Domain Group: System Environment/Base URL: ftp://munnari.oz.au/pub/ @@ -14,10 +14,11 @@ URL: ftp://munnari.oz.au/pub/ # final zoneinfo files. Source0: tzdata-base-0.tar.bz2 # These are official upstream. -Source1: ftp://elsie.nci.nih.gov/pub/tzdata%{tzdata_version}.tar.gz -Source2: ftp://elsie.nci.nih.gov/pub/tzcode%{tzcode_version}.tar.gz +Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz +Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz # __decl_patches Patch0: tzdata-2011n-leapsec.patch +Patch1: tzdata-2011n-chile.patch # __end BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -51,9 +52,13 @@ tar xzf %{SOURCE2} -C tzcode%{tzcode_version} sed -e 's|@objpfx@|'`pwd`'/obj/|' \ -e 's|@datadir@|%{_datadir}|' \ Makeconfig.in > Makeconfig + +pushd tzdata%{tzdata_version} # __apply_patches -%patch0 -d tzdata%{tzdata_version} +%patch0 -p0 +%patch1 -p0 # __end +popd mkdir javazic tar zxf %{SOURCE3} -C javazic @@ -115,6 +120,10 @@ rm -rf %{buildroot} %{_datadir}/javazi %changelog +* Fri Feb 24 2012 Petr Machata - 2011n-4 +- Add a patch for change in Chilean DST +- Update URLs + * Tue Feb 21 2012 Petr Machata - 2011n-3 - Add a patch for the leap second that will occur this summer