diff --git a/.gitignore b/.gitignore index 51713f2..7b4b161 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2017a.tar.gz -SOURCES/tzdata2017a.tar.gz +SOURCES/tzcode2017b.tar.gz +SOURCES/tzdata2017b.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index 3a0804b..a974fd9 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -033ae665967d5531a0e108431cbf79c9f147f27d SOURCES/tzcode2017a.tar.gz -31cf148e8bb97fe60bc7879a9e2570aa207925ff SOURCES/tzdata2017a.tar.gz +b873572cd29bcc7e1f56b32a6e414c2d5d96dac9 SOURCES/tzcode2017b.tar.gz +0f13bbb641f5742796609d3484006fe01fa654f1 SOURCES/tzdata2017b.tar.gz diff --git a/SOURCES/0001-Fix-Liberia-1972-transition-and-pre-1972-abbr.patch b/SOURCES/0001-Fix-Liberia-1972-transition-and-pre-1972-abbr.patch deleted file mode 100644 index 07e65e4..0000000 --- a/SOURCES/0001-Fix-Liberia-1972-transition-and-pre-1972-abbr.patch +++ /dev/null @@ -1,75 +0,0 @@ -From d582a6e3b650d3f66ac43968696ee94b53166f1a Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 2 Mar 2017 01:30:19 -0800 -Subject: [PROPOSED] Fix Liberia 1972 transition and pre-1972 abbr - -* NEWS: Document this. -* africa (Africa/Monrovia): The 1972 transition was on January 7, -not May 1. (Shanks was wrong again! and Howse was right.) -Use MMT for pre-1972 abbreviation. ---- - NEWS | 10 ++++++++++ - africa | 25 ++++++++++++++++--------- - 2 files changed, 26 insertions(+), 9 deletions(-) - -diff --git a/NEWS b/NEWS -index 306685a..b3917d0 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,15 @@ - News for the tz database - -+Unreleased, experimental changes -+ -+ Changes to past time stamps -+ -+ Liberia changed from -004430 to +00 on 1972-01-07, not 1972-05-01. -+ -+ Use "MMT" to abbreviate Liberia's time zone before 1972, as "-004430" -+ is one byte over the POSIX limit. (Problem reported by Derick Rethans.) -+ -+ - Release 2017a - 2017-02-28 00:05:36 -0800 - - Briefly: Southern Chile moves from -04/-03 to -03, and Mongolia -diff --git a/africa b/africa -index e617396..dcc20b9 100644 ---- a/africa -+++ b/africa -@@ -420,18 +420,25 @@ Link Africa/Nairobi Indian/Mayotte - # See Africa/Johannesburg. - - # Liberia --# From Paul Eggert (2006-03-22): --# In 1972 Liberia was the last country to switch --# from a UTC offset that was not a multiple of 15 or 20 minutes. --# Howse reports that it was in honor of their president's birthday. --# Shank & Pottenger report the date as May 1, whereas Howse reports Jan; --# go with Shanks & Pottenger. --# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and --# Whitman each report -0:44:30; go with the more precise figure. -+# -+# From Paul Eggert (2017-03-02): -+# -+# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30. -+# -+# In 1972 Liberia was the last country to switch from a UTC offset -+# that was not a multiple of 15 or 20 minutes. The 1972 change was on -+# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of: -+# Presidential Papers: First year of the administration of -+# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972. -+# Monrovia: Executive Mansion. -+# -+# Use the abbreviation "MMT" before 1972, as the more-accurate numeric -+# abbreviation "-004430" would be one byte over the POSIX limit. -+# - # Zone NAME GMTOFF RULES FORMAT [UNTIL] - Zone Africa/Monrovia -0:43:08 - LMT 1882 - -0:43:08 - MMT 1919 Mar # Monrovia Mean Time -- -0:44:30 - -004430 1972 May -+ -0:44:30 - MMT 1972 Jan 7 # approximately MMT - 0:00 - GMT - - ############################################################################### --- -2.7.4 diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index d3b471f..fa509d7 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2017a -%define tzdata_version 2017a -%define tzcode_version 2017a +Version: 2017b +%define tzdata_version 2017b +%define tzcode_version 2017b Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -10,8 +10,6 @@ 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 -Patch0: 0001-Fix-Liberia-1972-transition-and-pre-1972-abbr.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: gawk, glibc, perl BuildRequires: glibc-common >= 2.5.90-7 @@ -43,8 +41,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch0 -p1 - mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -127,6 +123,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Mon Mar 20 2017 Patsy Franklin - 2017b-1 +- Rebase to tzdata-2017b. + - Haiti resumed DST on March 12, 2017. + * Wed Mar 01 2017 Patsy Franklin - 2017a-1 - Rebase to tzdata-2017a. - Mongolia no longer observes DST. (BZ #1425214)