diff --git a/0001-Positive-leap-second-on-2016-12-31.patch b/0001-Positive-leap-second-on-2016-12-31.patch new file mode 100644 index 0000000..1f60c2e --- /dev/null +++ b/0001-Positive-leap-second-on-2016-12-31.patch @@ -0,0 +1,66 @@ +From 6d5fc7fed0690f22574a9b795575e2bb7962716c Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Mon, 18 Jul 2016 23:10:36 -0400 +Subject: [PATCH] Positive leap second on 2016-12-31 + +* leap-seconds.list: Per IERS Bulletin C52 (2016-07-06), a +positive leap second will be inserted into the UTC time scale at the end +of 2016-12-31. Update file from NIST, retrieved from +. +--- + leap-seconds.list | 13 +++++++------ + 1 file changed, 7 insertions(+), 6 deletions(-) + +diff --git a/leap-seconds.list b/leap-seconds.list +index 7552796..22fa785 100644 +--- a/leap-seconds.list ++++ b/leap-seconds.list +@@ -143,7 +143,7 @@ + # Boulder, Colorado + # Judah.Levine@nist.gov + # +-# Last Update of leap second values: 5 January 2015 ++# Last Update of leap second values: 8 July 2016 + # + # The following line shows this last update date in NTP timestamp + # format. This is the date on which the most recent change to +@@ -151,7 +151,7 @@ + # be identified by the unique pair of characters in the first two + # columns as shown below. + # +-#$ 3629404800 ++#$ 3676924800 + # + # The NTP timestamps are in units of seconds since the NTP epoch, + # which is 1 January 1900, 00:00:00. The Modified Julian Day number +@@ -199,10 +199,10 @@ + # current -- the update time stamp, the data and the name of the file + # will not change. + # +-# Updated through IERS Bulletin C51 +-# File expires on: 28 December 2016 ++# Updated through IERS Bulletin C52 ++# File expires on: 28 June 2017 + # +-#@ 3691872000 ++#@ 3707596800 + # + 2272060800 10 # 1 Jan 1972 + 2287785600 11 # 1 Jul 1972 +@@ -231,6 +231,7 @@ + 3439756800 34 # 1 Jan 2009 + 3550089600 35 # 1 Jul 2012 + 3644697600 36 # 1 Jul 2015 ++3692217600 37 # 1 Jan 2017 + # + # the following special comment contains the + # hash value of the data in this file computed +@@ -246,4 +247,4 @@ + # the hash line is also ignored in the + # computation. + # +-#h afc03691 8ff53838 42080ba1 cdd22f1 48192c10 ++#h dacf2c42 2c4765d6 3c797af8 2cf630eb 699c8c67 +-- +2.6.6 + diff --git a/timezone-java.changes b/timezone-java.changes index 444a496..610f8e6 100644 --- a/timezone-java.changes +++ b/timezone-java.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 17:29:14 UTC 2016 - astieger@suse.com + +- A positive leap second will be added at the end of 2016-12-31 + (bsc#988184) 0001-Positive-leap-second-on-2016-12-31.patch + ------------------------------------------------------------------- Tue Aug 2 08:28:03 UTC 2016 - astieger@suse.com diff --git a/timezone-java.spec b/timezone-java.spec index b0759cf..fde4bed 100644 --- a/timezone-java.spec +++ b/timezone-java.spec @@ -43,6 +43,8 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch +# PATCH-FIX-UPSTREAM 0001-Positive-leap-second-on-2016-12-31.patch bsc#988184 +Patch6: 0001-Positive-leap-second-on-2016-12-31.patch # COMMON-END # COMMON-END Url: http://www.gnu.org/software/libc/libc.html @@ -74,6 +76,7 @@ package is intended for Java Virtual Machine based on OpenJDK. %else %patch5 -p1 %endif +%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END # COMMON-PREP-END diff --git a/timezone.changes b/timezone.changes index 444a496..610f8e6 100644 --- a/timezone.changes +++ b/timezone.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Aug 8 17:29:14 UTC 2016 - astieger@suse.com + +- A positive leap second will be added at the end of 2016-12-31 + (bsc#988184) 0001-Positive-leap-second-on-2016-12-31.patch + ------------------------------------------------------------------- Tue Aug 2 08:28:03 UTC 2016 - astieger@suse.com diff --git a/timezone.spec b/timezone.spec index 8c4bd76..d301761 100644 --- a/timezone.spec +++ b/timezone.spec @@ -41,6 +41,8 @@ Patch2: tzcode-fromname.patch Patch3: iso3166-uk.diff Patch4: tzcode-link.diff Patch5: tzcode-symlink.patch +# PATCH-FIX-UPSTREAM 0001-Positive-leap-second-on-2016-12-31.patch bsc#988184 +Patch6: 0001-Positive-leap-second-on-2016-12-31.patch # COMMON-END BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -68,6 +70,7 @@ can select an appropriate time zone for your system with YaST. %else %patch5 -p1 %endif +%patch6 -p1 sed -ri 's@/usr/local/etc/zoneinfo@%{_datadir}/zoneinfo@g' *.[1358] # COMMON-PREP-END