From 58d77a3f15398c4048d0fc300b14157e9c947e15 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Wed, 14 Oct 2020 18:15:30 -0400
Subject: [PATCH] Resolves: #1886114  Rebase to tzdata-2020b  - Yukon timezones
 represented by America/Whitehorse and    America/Dawson will change time zone
 rules from -08/-07 to    permanent -07 on 2020-11-01, not on 2020-03-08 as
 2020a had it.  - The most recent winter(+08)/summer(+11) transition for Casey
 Station,    Antarctica was 2020-10-04 00:01.  - Remove obsolete files
 pacificnew, systemv, and yearistype.sh    from the distribution.

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

diff --git a/.gitignore b/.gitignore
index a3c2842..7b2a10e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -176,3 +176,5 @@ noarch/
 /tzdata2019c.tar.gz
 /tzcode2020a.tar.gz
 /tzdata2020a.tar.gz
+/tzcode2020b.tar.gz
+/tzdata2020b.tar.gz
diff --git a/sources b/sources
index aee7575..e84890a 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2020a.tar.gz) = 5235d6590e844491df32375857f5f36ba0046f2d21a078375188dff79b125cf9b69136a0a431624de1ecfa9d53b62a232f0e6ee0b734294cec62b670e6265cb2
-SHA512 (tzdata2020a.tar.gz) = 2a2fc2e3ad8a6e4c574242296c847ad582c2c1d86add9c556e65c812d19b9528522e3c4dddb5239017091825d2acc5a2ccaf21dc41b900b6c300ef4264cc5a9d
+SHA512 (tzcode2020b.tar.gz) = 04849f196430717962cbeedf11bbba592c304eaff5d67350c936af83dc8e8cb4cedc1c5f461c984aef05124d6c0f13a874789dff77b85a4b399faf80d75537e0
+SHA512 (tzdata2020b.tar.gz) = 27ade698e61881e637ab04834633595cfbdb08fd97177e9731093165d1268a64dffa0570b5e137b9daa4374e6c6827ed01c476074ec61ec0b9a44a7f23479be9
diff --git a/tzdata.spec b/tzdata.spec
index 433f7ab..b241324 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020a
-%define tzdata_version 2020a
-%define tzcode_version 2020a
-Release: 4%{?dist}
+Version: 2020b
+%define tzdata_version 2020b
+%define tzcode_version 2020b
+Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
 Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@@ -78,7 +78,7 @@ echo "%{name}%{tzdata_version}" >> VERSION
 make tzdata.zi
 
 FILES="africa antarctica asia australasia europe northamerica southamerica
-       pacificnew etcetera backward factory"
+       etcetera backward factory"
 
 mkdir zoneinfo/{,posix,right}
 zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
@@ -90,7 +90,7 @@ zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
 # 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/southamerica rearguard/etcetera \
       rearguard/backward"
 
 # Java 6/7 tzdata
@@ -134,6 +134,16 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 14 2020 Patsy Griffin <patsy@redhat.com> - 2020b-1
+- Rebase to tzdata-2020b
+  - Yukon timezones represented by America/Whitehorse and
+    America/Dawson will change time zone rules from -08/-07 to
+    permanent -07 on 2020-11-01, not on 2020-03-08 as 2020a had it.
+  - The most recent winter(+08)/summer(+11) transition for Casey Station,
+    Antarctica was 2020-10-04 00:01.
+  - Remove obsolete files pacificnew, systemv, and yearistype.sh
+    from the distribution.
+
 * Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2020a-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild