From 6395daa28e6dcd26702680ba49edf178310563eb Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Mon, 12 Nov 2018 11:43:50 -0500
Subject: [PATCH] Rebase to tzdata-2018g   - Morocco will change from
 UTC+00/+01 to permanent +01 effective 2018-10-27.   - Includes changes for
 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.     - Morocco will change from UTC+00/+01 to permanent
 +01 effective 2018-10-27.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 37 +++++++++++++++++++++++++++++++------
 3 files changed, 35 insertions(+), 8 deletions(-)

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/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 21e3d98..c101b02 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 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
@@ -41,6 +41,15 @@ This package contains timezone information for use by Java runtimes.
 
 %patch002 -p1
 
+# tzdata-2018g introduce 25:00 transition times.  This breaks OpenJDK.
+# Use rearguard for tzdata-2018g java
+mkdir rearguard
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
+mv tzdata2018g-rearguard.tar.gz rearguard
+pushd rearguard
+tar zxf tzdata%{version}-rearguard.tar.gz
+popd
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -80,6 +89,12 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 
 # grep -v tz-art.htm tz-link.htm > tz-link.html
 
+# tzdata-2018g uses 25:00 which breaks java - use the rearguard files for java
+JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
+      rearguard/australasia rearguard/europe rearguard/northamerica \
+      rearguard/southamerica rearguard/pacificnew rearguard/etcetera \
+      rearguard/backward"
+
 # Java 6/7 tzdata
 pushd javazic
 javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
@@ -87,7 +102,7 @@ popd
 
 java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
   -d javazi \
-  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
+  $JAVA_FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
 
 # Java 8 tzdata
 pushd javazic-1.8
@@ -97,7 +112,7 @@ popd
 java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
     -srcdir . -dstfile tzdb.dat \
     -verbose \
-    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
+    $JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
 
 %install
 rm -fr $RPM_BUILD_ROOT
@@ -121,6 +136,16 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Nov 12 2018 Patsy Griffin Franklin <pfrankli@redhat.com> - 2018g-1
+- Rebase to tzdata-2018g
+  Includes changes for 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.
+  - Morocco will change from UTC+00/+01 to permanent +01 effective 2018-10-27.
+
 * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2018e-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild