diff --git a/.gitignore b/.gitignore index f0fd88e..acb4ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -164,3 +164,5 @@ noarch/ /tzdata2018d.tar.gz /tzcode2018e.tar.gz /tzdata2018e.tar.gz +/tzcode2018g.tar.gz +/tzdata2018g.tar.gz diff --git a/0001-Correct-tm_dst-during-Morocco-transition.patch b/0001-Correct-tm_dst-during-Morocco-transition.patch new file mode 100644 index 0000000..b7b9256 --- /dev/null +++ b/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/sources b/sources index 2198b31..d4eb179 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717 -SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae +SHA512 (tzcode2018g.tar.gz) = 58f89b7323bfe795c5f13039f7527d18b15c9e37fce6e9fa1a402ce2689bf5c772cf1ffb86f23309814a563f9f429da472df1229818b07b1e04f16bdedb21484 +SHA512 (tzdata2018g.tar.gz) = 92e9bbd61f51be8f2cf7ec9491691e5e2f97803914dbad77b7fb8b6600ed68fc3b98450fc808bb2d4c6c835df5f9eb7bf4529d059d9b1370f2ab4c12e7f1adfa diff --git a/tzdata.spec b/tzdata.spec index 695fe54..9871e03 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,16 @@ Summary: Timezone data Name: tzdata -Version: 2018e -%define tzdata_version 2018e -%define tzcode_version 2018e -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-Correct-tm_dst-during-Morocco-transition.patch Patch002: 0002-Fix-have-snprintf-error.patch BuildRequires: gawk, glibc, perl-interpreter @@ -40,8 +41,28 @@ 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 +# compatibility with existing Red Hat Enterprise Linux installs. Future releases of +# Red Hat Enterprise Linux will be transitioning to the default or "vanguard" tzdata +# data set. +# +# The "rearguard" and "vanguard" data sets are defined by the upstream tzdata project +# and represent approximately the same data, with "vanguard" optimized for newer time +# zone data tooling, and "rearguard" optimized for compatibility with existing tooling. +# For example "vanguard" implements support for negative DST offsets, while "rearguard" +# supports the traditional format. + +# Create the reargard data files. +make VERSION=%{version} tzdata%{version}-rearguard.tar.gz +tar zxf tzdata%{version}-rearguard.tar.gz + +# Run make to re-create the tzdata.zi file for rearguard format +rm tzdata.zi +make VERSION=%{version} DATAFORM=rearguard tzdata.zi + mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic @@ -69,8 +90,6 @@ tar xf %{SOURCE4} echo "%{name}%{tzdata_version}" >> VERSION %build -# Run make to create the tzdata.zi file -make tzdata.zi FILES="africa antarctica asia australasia europe northamerica southamerica pacificnew etcetera backward" @@ -130,6 +149,17 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* 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. +- Include changes introduced in tzdata-2018f + - Volgograd will change from UTC+03 to UTC+04 on 2018-10-28 at 02:00. + - Fiji will end DST on 2019-01-13 instead of the 2019-01-20 as + previously predicted. + - Most of Chile will end DST on the first Saturday in April at 24:00 + and restart DST on the first Saturday in September at 24:00. + * Fri Sep 28 2018 Patsy Franklin - 2018e-2 - Add make check for testing.