Merge branch 'f14' into f16

This commit is contained in:
Petr Machata 2012-02-21 14:51:55 +01:00
commit 1e14077115
2 changed files with 83 additions and 1 deletions

View File

@ -0,0 +1,77 @@
--- 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

View File

@ -3,7 +3,7 @@ Name: tzdata
Version: 2011n
%define tzdata_version 2011n
%define tzcode_version 2011i
Release: 2%{?dist}
Release: 3%{?dist}
License: Public Domain
Group: System Environment/Base
URL: ftp://munnari.oz.au/pub/
@ -17,6 +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
Patch0: tzdata-2011n-leapsec.patch
# __end
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@ -51,6 +52,7 @@ sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-e 's|@datadir@|%{_datadir}|' \
Makeconfig.in > Makeconfig
# __apply_patches
%patch0 -d tzdata%{tzdata_version}
# __end
mkdir javazic
@ -113,6 +115,9 @@ rm -rf %{buildroot}
%{_datadir}/javazi
%changelog
* Tue Feb 21 2012 Petr Machata <pmachata@redhat.com> - 2011n-3
- Add a patch for the leap second that will occur this summer
* Thu Nov 3 2011 Petr Machata <pmachata@redhat.com> - 2011n-2
- Fix building of Java zones. Patch by Deepak Bhole