From 92df08180d8f24480b620882b009d52840077e97 Mon Sep 17 00:00:00 2001
From: Patsy Franklin <pfrankli@redhat.com>
Date: Tue, 29 May 2018 13:53:44 -0400
Subject: [PATCH] Resolves: #1583794   Rebase to tzdata-2018e   - North Korea
 changed from UTC+8:30 to UTC+9 on May 5, 2018.   - In this update, the
 upstream project now defaults to using     the "vanguard" data implementation
 which includes negative DST offsets.

---
 .gitignore    |  2 ++
 8051641.patch | 17 +++++++++++++++++
 sources       |  4 ++--
 tzdata.spec   | 14 +++++++++++---
 4 files changed, 32 insertions(+), 5 deletions(-)
 create mode 100644 8051641.patch

diff --git a/.gitignore b/.gitignore
index aa65342..f0fd88e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -162,3 +162,5 @@ noarch/
 /tzdata2018c.tar.gz
 /tzcode2018d.tar.gz
 /tzdata2018d.tar.gz
+/tzcode2018e.tar.gz
+/tzdata2018e.tar.gz
diff --git a/8051641.patch b/8051641.patch
new file mode 100644
index 0000000..4f5be47
--- /dev/null
+++ b/8051641.patch
@@ -0,0 +1,17 @@
+diff -r c8a71253d6e2 -r 189490f29d1e make/src/classes/build/tools/tzdb/ZoneRulesBuilder.java
+--- javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Thu Oct 23 11:42:20 2014 +0200
++++ javazic-1.8/build/tools/tzdb/ZoneRulesBuilder.java	Mon Dec 29 21:42:22 2014 +0300
+@@ -491,10 +491,10 @@
+                 TZRule rule = new TZRule(year, month, dayOfMonthIndicator, dayOfWeek, time, timeEndOfDay, timeDefinition, savingAmountSecs);
+                 if (lastRule) {
+                     lastRuleList.add(rule);
+-                    maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 } else {
+                     ruleList.add(rule);
+                 }
++                maxLastRuleStartYear = Math.max(startYear, maxLastRuleStartYear);
+                 year++;
+             }
+         }
+--
+cgit v0.9.2
diff --git a/sources b/sources
index e64a5c0..2198b31 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2018d.tar.gz) = e79a95e235cd384247e4112d5154f30eb7b40f28dab4872ed9153e45bf56569949d0845bc1b9ad24b7a5f9609bdadfc892959dbf0d540dbca79b18398dc4f930
-SHA512 (tzdata2018d.tar.gz) = ee961aedc34e134172523a29fb8a9358f42649d06ffcd2d8a6ad86eeb174a80af5bfc4637e9e52ecdc51fa3d01afef9fff660a69ed72904ff747a59b5634830b
+SHA512 (tzcode2018e.tar.gz) = 4a245cae2d0922b24539a94cf4a8ccc2bba1ee696e0aaefecb41c7c8d78724a7fcea6039909336177b8b26fec8fc47719e3e56ca9839dbaf52f9a4fec84d4717
+SHA512 (tzdata2018e.tar.gz) = d059fcd381b2f6ecdafcd68fdd2a00451d1bf9b1affeb164ae7cabca2e022d499e77f0706ec3f3091b8e84c2211aa66da6c90937108771f1bf070cfebc105cae
diff --git a/tzdata.spec b/tzdata.spec
index 5272d1a..80b726f 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2018d
-%define tzdata_version 2018d
-%define tzcode_version 2018d
+Version: 2018e
+%define tzdata_version 2018e
+%define tzcode_version 2018e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -32,6 +32,7 @@ Patch101: rebase-01.patch
 Patch102: rebase-02.patch
 Patch103: 7090844.patch
 Patch104: 7133138.patch
+Patch105: 8051641.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -63,6 +64,7 @@ find . -type f -name '*.java' -print0 \
 popd
 
 tar xf %{SOURCE4}
+%patch105
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -123,6 +125,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon May 14 2018 Patsy Franklin <pfrankli@redhat.com> - 2018e-1
+- Rebase to tzdata-2018e
+  - North Korea changed from UTC+8:30 to UTC+9 on May 5, 2018.
+  - In this update, the upstream project now defaults to using
+    the "vanguard" data implementation which includes negative DST offsets.
+
 * Wed Mar 28 2018 Patsy Franklin <pfrankli@redhat.com> - 2018d-1
 - Rebase to tzdata-2018d:
   - DST for Asia/Gaza and Asia/Hebron has changed