diff --git a/.gitignore b/.gitignore index 1e50c79..3f0fd30 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2018f.tar.gz -SOURCES/tzdata2018f.tar.gz +SOURCES/tzcode2018g.tar.gz +SOURCES/tzdata2018g.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index 3e0d68a..adc0670 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -292e236bb1b201d582985c80d344f5ce4c5b0433 SOURCES/tzcode2018f.tar.gz -8b30b7fe40d348db9b5acc4ed2245f96265039ee SOURCES/tzdata2018f.tar.gz +7d023ec872f935e4e5a8fc45dbddc1fe57796765 SOURCES/tzcode2018g.tar.gz +05824697e0ef77ce28f84c76e79c21984916bbe8 SOURCES/tzdata2018g.tar.gz diff --git a/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch b/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch deleted file mode 100644 index 3637343..0000000 --- a/SOURCES/0001-Avoid-25-00-in-rearguard-format.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit 401c42d991d4277cd606933fc9f5d9a13d1ac228 -Author: Paul Eggert -Date: Thu Oct 18 11:06:07 2018 -0700 - - Avoid 25:00 in rearguard format - - (Problem reported by Christos Zoulas.) - * NEWS: Mention this. - * ziguard.awk: Change "Rule ... Sat>=8 25:00" to "Rule ... Sun>=9 1:00". - -diff --git a/NEWS b/NEWS -index aeeef10..16f0947 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,16 @@ - News for the tz database - -+Unreleased, experimental changes -+ -+ Changes to code -+ -+ The translator to rearguard format now rewrites the line -+ "Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S" to -+ "Rule Japan 1948 1951 - Sep Sun>=9 1:00 0 S". -+ This caters to zic before 2007 and to at least one Java-based zi -+ compiler of uncertain vintage. (Reported by Christos Zoulas.) -+ -+ - Release 2018f - 2018-10-18 00:14:18 -0700 - - Briefly: -diff --git a/ziguard.awk b/ziguard.awk -index 42e2910..e3c7298 100644 ---- a/ziguard.awk -+++ b/ziguard.awk -@@ -80,6 +80,13 @@ DATAFORM != "main" { - if (comment_out) { - sub(/^/, "#") - } -+ -+ # In rearguard format, change the Japan rule line with "Sat>=8 25:00" -+ # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java. -+ if (!vanguard && $1 == "Rule" && $7 == "Sat>=8" && $8 == "25:00") { -+ sub(/Sat>=8/, "Sun>=9") -+ sub(/25:00/, " 1:00") -+ } - } - - # If a Link line is followed by a Zone line for the same data, comment diff --git a/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch b/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch new file mode 100644 index 0000000..b7b9256 --- /dev/null +++ b/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch @@ -0,0 +1,82 @@ +From ddc67c5c9aac03778d99090211437d4b869e5742 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 28 Oct 2018 12:10:43 -0700 +Subject: [PROPOSED] Correct tm_dst during Morocco transition + +(Thanks to Michael Deckers and Matt Johnson.) +* NEWS: Mention this, and correct the misleading 2018g notes +without misrepresenting the 2018g change. +* africa (Africa/Casablanca, Africa/El_Aaiun): +Transition was at 2018-10-28 03:00, not 2018-10-27. +--- + NEWS | 15 ++++++++++++--- + africa | 8 ++++---- + 2 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/NEWS b/NEWS +index d4cb723..f9bbc0c 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,14 +1,23 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Changes to past tm_isdst flags ++ ++ For the recent Morocco change, the tm_isdst flag should be 1 from ++ 2018-10-27 00:00 to 2018-10-28 03:00. (Thanks to Michael Deckers.) ++ Give a URL to the official decree. (Thanks to .) ++ ++ + Release 2018g - 2018-10-26 22:22:45 -0700 + + Briefly: +- Morocco switches to permanent +01 on 2018-10-27. ++ Morocco switches to permanent +01 on 2018-10-28. + + Changes to future timestamps + +- Morocco switches from +00/+01 to permanent +01 effective 2018-10-27, +- so its clocks will not fall back on 2018-10-28 as previously scheduled. ++ Morocco switches from +00/+01 to permanent +01 effective 2018-10-28, ++ so its clocks will not fall back as previously scheduled. + (Thanks to Mohamed Essedik Najd and Brian Inglis.) + + Changes to code +diff --git a/africa b/africa +index a26b91b..2a15e1e 100644 +--- a/africa ++++ b/africa +@@ -847,8 +847,8 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis + # From Mohamed Essedik Najd (2018-10-26): + # Today, a Moroccan government council approved the perpetual addition + # of 60 minutes to the regular Moroccan timezone. +-# From Brian Inglis (2018-10-26): +-# http://www.maroc.ma/fr/actualites/le-conseil-de-gouvernement-adopte-un-projet-de-decret-relatif-lheure-legale-stipulant-le ++# From Matt Johnson (2018-10-28): ++# http://www.sgg.gov.ma/Portals/1/BO/2018/BO_6720-bis_Ar.pdf + + # RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Morocco 1939 only - Sep 12 0:00 1:00 - +@@ -897,7 +897,7 @@ Rule Morocco 2018 only - Jun 17 2:00 1:00 - + Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + 0:00 Morocco +00/+01 1984 Mar 16 + 1:00 - +01 1986 +- 0:00 Morocco +00/+01 2018 Oct 27 ++ 0:00 Morocco +00/+01 2018 Oct 28 3:00 + 1:00 - +01 + + # Western Sahara +@@ -913,7 +913,7 @@ Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26 + + Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún + -1:00 - -01 1976 Apr 14 +- 0:00 Morocco +00/+01 2018 Oct 27 ++ 0:00 Morocco +00/+01 2018 Oct 28 3:00 + 1:00 - +01 + + # Mozambique +-- +2.17.1 + diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index 0f1548e..ebcb215 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,16 +1,16 @@ Summary: Timezone data Name: tzdata -Version: 2018f -%define tzdata_version 2018f -%define tzcode_version 2018f -Release: 2%{?dist} +Version: 2018g +%define tzdata_version 2018g +%define tzcode_version 2018g +Release: 1%{?dist} License: Public Domain Group: System Environment/Base 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 -Patch001: 0001-Avoid-25-00-in-rearguard-format.patch +Patch001: 0001-Correct-tm_dst-during-Morocco-transition.patch Patch002: 0002-Fix-have-snprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -150,8 +150,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog -* Fri Oct 19 2018 Patsy Griffin Franklin - 2018f-2 -- Bump release and rebuild for target. +* Mon Oct 29 2018 Patsy Griffin Franklin - 2018g-1 +- Rebase to tzdata-2018g + - Morocco will remain at UTC+1 rather than switching back to UTC+0 as + planned. This change is effective Octobober 28, 2018. * Thu Oct 18 2018 Patsy Griffin Franklin - 2018f-1 - Europe/Volgograd will change from UTC+3 to UTC+4 on October 28,2018.