diff --git a/.gitignore b/.gitignore index 3f0fd30..e9793e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2018g.tar.gz -SOURCES/tzdata2018g.tar.gz +SOURCES/tzcode2018i.tar.gz +SOURCES/tzdata2018i.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index adc0670..32be258 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -7d023ec872f935e4e5a8fc45dbddc1fe57796765 SOURCES/tzcode2018g.tar.gz -05824697e0ef77ce28f84c76e79c21984916bbe8 SOURCES/tzdata2018g.tar.gz +2b34a820433b1be345dc12d08361261d7facdf8e SOURCES/tzcode2018i.tar.gz +bd5cd102c4a3c8206834b9bc6922437cc698c3c0 SOURCES/tzdata2018i.tar.gz diff --git a/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch b/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch deleted file mode 100644 index b7b9256..0000000 --- a/SOURCES/0001-Correct-tm_dst-during-Morocco-transition.patch +++ /dev/null @@ -1,82 +0,0 @@ -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 ebcb215..87553f9 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2018g -%define tzdata_version 2018g -%define tzcode_version 2018g +Version: 2018i +%define tzdata_version 2018i +%define tzcode_version 2018i Release: 1%{?dist} License: Public Domain Group: System Environment/Base @@ -10,7 +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 -Patch001: 0001-Correct-tm_dst-during-Morocco-transition.patch Patch002: 0002-Fix-have-snprintf.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -44,7 +43,6 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch001 -p1 %patch002 -p1 # Currently tzdata is providing the "rearguard" data set for maximum @@ -150,6 +148,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/javazi-1.8 %changelog +* Wed Jan 02 2019 Patsy Griffin Franklin - 2018i-1 +- Rebase to tzdata-2018i (includes changes from tzdata-2018h) + - São Tomé and Príncipe changed from UTC+01 to UTC+00 on 2019-01-01. + - Qyzylorda, Kazakhstan changed from UTC+06 to UTC+05 on 2018-12-21. + - Created a new zone Asia/Qostanay since Qostanay, Kazakhstan didn't + transition with the Qyzylorda change. + - Metlakatla, Alaska will observe PST for this winter only. + - Predict that Morocco will continue to adjust clocks around Ramadan. + - Also include predictions for Iran from 2038 through 2090. + * 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