From c1fcc0f160061e73bbe4efdddc5a9892cf0a4298 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Tue, 26 Oct 2021 12:23:36 +0000
Subject: [PATCH] import tzdata-2021e-1.el8

---
 .gitignore                            |  4 ++--
 .tzdata.metadata                      |  4 ++--
 SOURCES/0001-Fix-Jan-Mayen-typo.patch | 30 ---------------------------
 SPECS/tzdata.spec                     | 24 ++++++++++++++-------
 4 files changed, 21 insertions(+), 41 deletions(-)
 delete mode 100644 SOURCES/0001-Fix-Jan-Mayen-typo.patch

diff --git a/.gitignore b/.gitignore
index d8a8a5a..19e215c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2021b.tar.gz
-SOURCES/tzdata2021b.tar.gz
+SOURCES/tzcode2021e.tar.gz
+SOURCES/tzdata2021e.tar.gz
diff --git a/.tzdata.metadata b/.tzdata.metadata
index a6a8268..9e42074 100644
--- a/.tzdata.metadata
+++ b/.tzdata.metadata
@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-1fd5fbcca323380184589a54bc70111525edc519 SOURCES/tzcode2021b.tar.gz
-23f8f6880fafa938dfb442ce5352be6ba75b9609 SOURCES/tzdata2021b.tar.gz
+fca542541574e39dce906a7e22f3072dda9c1456 SOURCES/tzcode2021e.tar.gz
+4d64b912bf3b29029c0683c8b7fe4f79239e5ed7 SOURCES/tzdata2021e.tar.gz
diff --git a/SOURCES/0001-Fix-Jan-Mayen-typo.patch b/SOURCES/0001-Fix-Jan-Mayen-typo.patch
deleted file mode 100644
index c2c8d2e..0000000
--- a/SOURCES/0001-Fix-Jan-Mayen-typo.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 2a7c7c5873ff0eb725e8eafad04f6af6ada66dc6 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Sat, 25 Sep 2021 08:32:39 -0700
-Subject: [PROPOSED] Fix Jan Mayen typo
-
-Fix typo in 2021-09-24 revert of most of the 2021-05-19
-alike-since-1970 patch.  Problem reported by Chris Walton in:
-https://mm.icann.org/pipermail/tz/2021-September/030772.html
-* backward (Atlantic/Jan_Mayen): Link from Europe/Oslo,
-not Europe/Berlin.
----
- backward | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/backward b/backward
-index 7c288e3..5412c46 100644
---- a/backward
-+++ b/backward
-@@ -116,7 +116,7 @@ Link	Asia/Makassar		Asia/Ujung_Pandang
- Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
- Link	Asia/Bangkok		Asia/Vientiane
- Link	Atlantic/Faroe		Atlantic/Faeroe
--Link	Europe/Berlin		Atlantic/Jan_Mayen
-+Link	Europe/Oslo		Atlantic/Jan_Mayen
- Link	Africa/Abidjan		Atlantic/St_Helena
- Link	Australia/Sydney	Australia/ACT
- Link	Australia/Sydney	Australia/Canberra
--- 
-2.30.2
-
diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec
index a235e14..d25a58f 100644
--- a/SPECS/tzdata.spec
+++ b/SPECS/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021b
-%define tzdata_version 2021b
-%define tzcode_version 2021b
+Version: 2021e
+%define tzdata_version 2021e
+%define tzcode_version 2021e
 Release: 1%{?dist}
 License: Public Domain
 Group: System Environment/Base
@@ -10,7 +10,6 @@ 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-Fix-Jan-Mayen-typo.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
 
@@ -42,7 +41,6 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
-%patch001 -p1
 %patch002 -p1
 %patch003 -p1
 
@@ -151,8 +149,20 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
-* Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
-- Rebase to tzdata-2021b
+* Fri Oct 22 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
+- Rebase to tzdata-2021e - supersedes tzdata-2021d
+  - Pacific/Fiji suspended DST for the 2021/2022 season.
+  - 'zic -r' now marks unspecified timestamps with "-00".
+  - Palestine will fall back 2021-10-29 at 01:00, rather
+    than the predicted 2021-10-30.
+
+* Wed Oct 06 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
+- Rebase to tzdata-2021c - supersedes tzdata-2021b
+  - Revert most of 2021b changes to 'backward'.
+  - Fix 'zic -b fat' bug in pre-1970 32-bit data.
+  - Fix two Link line typos.
+  - Distribute SECURITY file.
+- Includes changes in tzdata-2021b
   - Innclude patch for Mayen
   - Jordan now starts DST on February's last Thursday.
   - Samoa no longer observes DST.