diff --git a/.gitignore b/.gitignore index 55574b2..51713f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2016j.tar.gz -SOURCES/tzdata2016j.tar.gz +SOURCES/tzcode2017a.tar.gz +SOURCES/tzdata2017a.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index 59220e0..3a0804b 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -ed16708699baea54e4a1adcef886039a6ea30ae1 SOURCES/tzcode2016j.tar.gz -804de038973c1ffb887117e27b5dbedce8fff541 SOURCES/tzdata2016j.tar.gz +033ae665967d5531a0e108431cbf79c9f147f27d SOURCES/tzcode2017a.tar.gz +31cf148e8bb97fe60bc7879a9e2570aa207925ff SOURCES/tzdata2017a.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 new file mode 100644 index 0000000..07e65e4 --- /dev/null +++ b/SOURCES/0001-Fix-Liberia-1972-transition-and-pre-1972-abbr.patch @@ -0,0 +1,75 @@ +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 a2d2a7a..d3b471f 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2016j -%define tzdata_version 2016j -%define tzcode_version 2016j +Version: 2017a +%define tzdata_version 2017a +%define tzcode_version 2017a Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -10,6 +10,8 @@ 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 @@ -41,6 +43,8 @@ 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 @@ -101,7 +105,7 @@ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ rm -fr $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT%{_datadir} cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir} -install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo +install -p -m 644 zone.tab zone1970.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8 @@ -123,6 +127,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Mar 01 2017 Patsy Franklin - 2017a-1 +- Rebase to tzdata-2017a. + - Mongolia no longer observes DST. (BZ #1425214) + - Add upstream patch to fix over-runing of POSIX limit on zone abbreviations. +- Add zone1970.tab file to the install list. (BZ #1414829) + * Wed Nov 23 2016 Patsy Franklin - 2016j-1 - Rebase to tzdata-2016ij - Saratov region of Russia is moving from +03 offset to +04 offset @@ -164,7 +174,7 @@ rm -rf $RPM_BUILD_ROOT - Rebase to 2016e - Egypt reinstates DST. -* Sun May 10 2016 Patsy Franklin - 2016d-2 +* Tue May 10 2016 Patsy Franklin - 2016d-2 - Fix java conditionals to always build all the java tzdata. OpenJDK 7 is the default/base Java. It is sufficient for building everything. (#1230903) @@ -234,7 +244,7 @@ rm -rf $RPM_BUILD_ROOT - Morocco will suspend DST from 2015-06-14 03:00 through 2015-07-19 02:00, not 06-13 and 07-18 as we had guessed. -* Mon May 5 2015 Patsy Franklin - 2015d-2 +* Tue May 5 2015 Patsy Franklin - 2015d-2 - Add support for generating OpenJDK 8+ timezone data - Resolves: rhbz#1212540