Resolves: #1751373

- Rebase to tzdata-2019c - forgot to commit the spec file changes

.gitignore

@@ -164,3 +164,13 @@ noarch/
 /tzdata2018d.tar.gz
 /tzcode2018e.tar.gz
 /tzdata2018e.tar.gz
+/tzcode2018g.tar.gz
+/tzdata2018g.tar.gz
+/tzcode2018i.tar.gz
+/tzdata2018i.tar.gz
+/tzcode2019a.tar.gz
+/tzdata2019a.tar.gz
+/tzcode2019b.tar.gz
+/tzdata2019b.tar.gz
+/tzdata2019c.tar.gz
+/tzcode2019c.tar.gz

sources

@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717
+SHA512 (tzdata2019c.tar.gz) = 2921cbb2fd44a6b8f7f2ed42c13fbae28195aa5c2eeefa70396bc97cdbaad679c6cc3c143da82cca5b0279065c02389e9af536904288c12886bf345baa8c6565
-SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae
+SHA512 (tzcode2019c.tar.gz) = 61ef36385f501c338c263081486de0d1fccd454b86f8777b0dbad4ea3f21bbde059d0a91c23e207b167ed013127d3db8b7528f0188814a8b44d1f946b19d9b8b

tzdata.spec

@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018e
+Version: 2019c
-%define tzdata_version 2018e
+%define tzdata_version 2019c
-%define tzcode_version 2018e
+%define tzcode_version 2019c
-Release: 2%{?dist}
+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 introduced 25:00 transition times.  This breaks OpenJDK.
+# Use rearguard for java
+mkdir rearguard
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
+mv tzdata%{version}-rearguard.tar.gz rearguard
+pushd rearguard
+tar zxf tzdata%{version}-rearguard.tar.gz
+popd
+
 mkdir javazic
 tar zxf %{SOURCE3} -C javazic
 pushd javazic
@@ -71,7 +80,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
 make tzdata.zi
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
-       pacificnew etcetera backward"
+       pacificnew etcetera backward factory"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -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 introduced 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 rearguard/factory"
+
 # 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,44 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Sep 23 2019 Patsy Griffin <patsy@redhat.com> - 2019c-1
+- Rebase to tzdata-2019c
+  - Fiji will observe DST from 2019-11-10 to 2020-01-12.
+  - Norfolk Island will begin observing Australian-style DST on 2019-10-06.
+- Add Factory back in to be more consistent with upstream.
+
+* Tue Jul 09 2019 Patsy Griffin <patsy@redhat.com> - 2019b-1
+- Rebase to tzdata-2019b
+  - Brazil will no longer observe DST going forward.
+  - The 2019 spring transition for Palestine occurred 03-29, not 03-30.
+
+* Fri Mar 29 2019 Patsy Griffin Franklin <patsy@redhat.com> - 2019a-1
+- Rebase to tzdata-2019a
+  - Palestine will start DST on 2019-03-30, rather than 2019-03-23 as
+    previously predicted.
+  - Metlakatla rejoined Alaska time on 2019-01-20, ending its observances
+    of Pacific standard time.
+
+* Mon Jan 14 2019 Patsy Griffin Franklin <pfrankli@redhat.com> - 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 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