Merge branch 'f16' into f17
Conflicts: tzdata.spec
This commit is contained in:
Petr Machata
commit
daafca592d
2
.gitignore
vendored
2
.gitignore
vendored
@ -69,3 +69,5 @@ noarch/
|
||||
/tzdata2011j.tar.gz
|
||||
/tzdata2011l.tar.gz
|
||||
/tzdata2011n.tar.gz
|
||||
/tzdata2012b.tar.gz
|
||||
/tzcode2012b.tar.gz
|
||||
|
||||
4
sources
4
sources
@ -1,4 +1,4 @@
|
||||
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
|
||||
e36d2f742c22f8c8dbf0686ac9769b55 tzdata-base-0.tar.bz2
|
||||
cf7f4335b7c8682899fa2814e711c1b2 tzcode2011i.tar.gz
|
||||
20dbfb28efa008ddbf6dd34601ea40fa tzdata2011n.tar.gz
|
||||
0615fd29def380a917e528433c820368 tzdata2012b.tar.gz
|
||||
6137322ffd36e1fd5128885be1c57008 tzcode2012b.tar.gz
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
--- 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 <Mauricio.Parada@synopsys.com>
|
||||
+# [edited by Glenn Eychaner <geychaner@lco.cl>]
|
||||
+#
|
||||
+# As stated in the website of the Chilean Energy Ministry
|
||||
+# <a href="http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html">
|
||||
+# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
|
||||
+# </a>
|
||||
+# 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.
|
||||
@ -1,77 +0,0 @@
|
||||
--- leapseconds 2012-01-06 10:47:32.000000000 +0000
|
||||
+++ leapseconds.new 2012-01-06 10:49:42.000000000 +0000
|
||||
@@ -48,40 +48,53 @@
|
||||
Leap 1998 Dec 31 23:59:60 + S
|
||||
Leap 2005 Dec 31 23:59:60 + S
|
||||
Leap 2008 Dec 31 23:59:60 + S
|
||||
+Leap 2012 Jun 30 23:59:60 + S
|
||||
|
||||
-# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
|
||||
+# INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
|
||||
#
|
||||
# SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
|
||||
#
|
||||
# SERVICE DE LA ROTATION TERRESTRE
|
||||
# OBSERVATOIRE DE PARIS
|
||||
# 61, Av. de l'Observatoire 75014 PARIS (France)
|
||||
-# Tel. : 33 (0) 1 40 51 22 29
|
||||
+# Tel. : 33 (0) 1 40 51 22 26
|
||||
# FAX : 33 (0) 1 40 51 22 91
|
||||
-# Internet : services.iers@obspm.fr
|
||||
+# e-mail : services.iers@obspm.fr
|
||||
+# http://hpiers.obspm.fr/eop-pc
|
||||
#
|
||||
-# Paris, 2 February 2011
|
||||
+# Paris, 5 January 2012
|
||||
#
|
||||
-# Bulletin C 41
|
||||
+# Bulletin C 43
|
||||
#
|
||||
-# To authorities responsible
|
||||
-# for the measurement and
|
||||
-# distribution of time
|
||||
+# To authorities responsible
|
||||
+# for the measurement and
|
||||
+# distribution of time
|
||||
#
|
||||
-# 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 :
|
||||
+# UTC TIME STEP
|
||||
+# on the 1st of July 2012
|
||||
#
|
||||
-# from 2009 January 1, 0h UTC, until further notice : UTC-TAI = -34 s
|
||||
#
|
||||
-# Leap seconds can be introduced in UTC at the end of the months of December
|
||||
-# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
|
||||
-# six months, either to announce a time step in UTC, or to confirm that there
|
||||
-# will be no time step at the next possible date.
|
||||
+# A positive leap second will be introduced at the end of June 2012.
|
||||
+# The sequence of dates of the UTC second markers will be:
|
||||
#
|
||||
-# Daniel GAMBIS
|
||||
-# Head
|
||||
-# Earth Orientation Center of the IERS
|
||||
-# Observatoire de Paris, France
|
||||
+# 2012 June 30, 23h 59m 59s
|
||||
+# 2012 June 30, 23h 59m 60s
|
||||
+# 2012 July 1, 0h 0m 0s
|
||||
+#
|
||||
+# The difference between UTC and the International Atomic Time TAI is:
|
||||
+#
|
||||
+# from 2009 January 1, 0h UTC, to 2012 July 1 0h UTC : UTC-TAI = - 34s
|
||||
+# from 2012 July 1, 0h UTC, until further notice : UTC-TAI = - 35s
|
||||
+#
|
||||
+# Leap seconds can be introduced in UTC at the end of the months of December
|
||||
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
|
||||
+# six months, either to announce a time step in UTC or to confirm that there
|
||||
+# will be no time step at the next possible date.
|
||||
+#
|
||||
+#
|
||||
+#
|
||||
+# Daniel GAMBIS
|
||||
+# Head
|
||||
+# Earth Orientation Center of IERS
|
||||
+# Observatoire de Paris, France
|
||||
22
tzdata.spec
22
tzdata.spec
@ -1,9 +1,9 @@
|
||||
Summary: Timezone data
|
||||
Name: tzdata
|
||||
Version: 2011n
|
||||
%define tzdata_version 2011n
|
||||
%define tzcode_version 2011i
|
||||
Release: 5%{?dist}
|
||||
Version: 2012b
|
||||
%define tzdata_version 2012b
|
||||
%define tzcode_version 2012b
|
||||
Release: 1%{?dist}
|
||||
License: Public Domain
|
||||
Group: System Environment/Base
|
||||
URL: ftp://munnari.oz.au/pub/
|
||||
@ -17,8 +17,6 @@ Source0: tzdata-base-0.tar.bz2
|
||||
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)
|
||||
@ -55,8 +53,6 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
|
||||
|
||||
pushd tzdata%{tzdata_version}
|
||||
# __apply_patches
|
||||
%patch0 -p0
|
||||
%patch1 -p0
|
||||
# __end
|
||||
popd
|
||||
|
||||
@ -120,6 +116,16 @@ rm -rf %{buildroot}
|
||||
%{_datadir}/javazi
|
||||
|
||||
%changelog
|
||||
* Tue Mar 6 2012 Petr Machata <pmachata@redhat.com> - 2012b-1
|
||||
- Rebase to 2012b; changes vs. 2011n-5:
|
||||
- Changes to zones for Antarctica stations
|
||||
- Armenia abolished DST in 2012 and forward
|
||||
- Cuba enters DST on 31st March
|
||||
- Falkland Islands will stay on permanent Summer Time
|
||||
- New zone for Creston Valley, Canada, which differs from Dawson
|
||||
Creek in past stamps. Changes to historical stamps in Canada.
|
||||
- Last year, Tokelau skipped over the date line together with Samoa
|
||||
|
||||
* Fri Feb 24 2012 Petr Machata <pmachata@redhat.com> - 2011n-5
|
||||
- Add a patch for change in Chilean DST
|
||||
- Update URLs
|
||||
|
||||
Loading…
Reference in New Issue
Block a user