From 38559a10b95d984b4607d9b4d9dca99aaee1b654 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 26 2020 08:10:24 +0000
Subject: import tzdata-2020d-2.el7


---

diff --git a/.gitignore b/.gitignore
index 76fc79c..0ba009b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2020b.tar.gz
-SOURCES/tzdata2020b.tar.gz
+SOURCES/tzcode2020d.tar.gz
+SOURCES/tzdata2020d.tar.gz
diff --git a/.tzdata.metadata b/.tzdata.metadata
index 93ebc70..ec93718 100644
--- a/.tzdata.metadata
+++ b/.tzdata.metadata
@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-1581c5cb8560daa1c2e4747ad6a9f19506b669c9 SOURCES/tzcode2020b.tar.gz
-89f5295b0bdbc8315f97fd8f7f5ed035f238a1e7 SOURCES/tzdata2020b.tar.gz
+4476969d62ca3840aaa9689231adcb49079dff03 SOURCES/tzcode2020d.tar.gz
+ac5070c8e2953c90f3ea4ebdba3257d7cc3308be SOURCES/tzdata2020d.tar.gz
diff --git a/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch b/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
deleted file mode 100644
index 95818e5..0000000
--- a/SOURCES/0001-Put-dummy-pacificnew-into-rearguard-tarball.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Mon, 12 Oct 2020 16:15:27 -0700
-Subject: [PROPOSED] Put dummy pacificnew into rearguard tarball
-
-Problem reported by Mike Cullinan in:
-https://mm.icann.org/pipermail/tz/2020-October/029309.html
-* Makefile (tzdata$(VERSION)-rearguard.tar.gz):
-Put an empty pacificnew file into the rearguard tarball.
-* NEWS: Mention this.
----
- Makefile | 6 +++++-
- NEWS     | 7 +++++++
- 2 files changed, 12 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index 28972c6..95f0a06 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1022,10 +1022,14 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out
- 		done
- 		sed '1s/$$/-rearguard/' \
- 		  <version >tzdata$(VERSION)-rearguard.dir/version
-+		: The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier.
-+		touch -md 2020-10-12T22:53:00Z \
-+		  tzdata$(VERSION)-rearguard.dir/pacificnew
- 		touch -cmr version tzdata$(VERSION)-rearguard.dir/version
- 		LC_ALL=C && export LC_ALL && \
- 		  (cd tzdata$(VERSION)-rearguard.dir && \
--		   tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
-+		   tar $(TARFLAGS) -cf - \
-+			$(COMMON) $(DATA) $(MISC) pacificnew | \
- 		     gzip $(GZIPFLAGS)) >$@.out
- 		mv $@.out $@
diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec
index ceb6bc1..7959522 100644
--- a/SPECS/tzdata.spec
+++ b/SPECS/tzdata.spec
@@ -1,16 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2020b
-%define tzdata_version 2020b
-%define tzcode_version 2020b
-Release: 3%{?dist}
+Version: 2020d
+%define tzdata_version 2020d
+%define tzcode_version 2020d
+Release: 2%{?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-Put-dummy-pacificnew-into-rearguard-tarball.patch
 Patch002: 0002-Fix-have-snprintf.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
 
@@ -45,7 +44,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 %patch003 -p1
 
@@ -152,6 +150,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Oct 21 2020 Patsy Griffin <patsy@redhat.com> - 2020d-2
+- Update release and rebuild.
+
+* Wed Oct 21 2020 Patsy Griffin <patsy@redhat.com> - 2020d-1
+- Rebase to tzdata-2020d
+ - Palestine will end summer time on 2020-10-24 rather than the
+   predicted 2020-10-31.
+
+* Mon Oct 19 2020 Patsy Griffin <patsy@redhat.com> - 2020c-1
+- Rebase to tzdata-2020c
+  - Fiji starts DST later than usual, on 2020-12-20.
+  - Rearguard now provides an empty file pacificnew to support
+    downstream software that expects it.
+
 * Tue Oct 13 2020 Patsy Griffin <patsy@redhat.com> - 2020b-3
 - Include the upstream patch to support pacificnew for java tzupdater.
 - Set POSIXRULES macro to continue installing posixrules file.