From 2e2d464dab6e7bb506b28a35036c716787e996d3 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Sun, 26 Sep 2021 15:57:10 -0400
Subject: [PATCH 01/12] Resolves: #2007807 Rebase to tzdata-2021b - Jordan now
 starts DST on February's last Thursday. - Samoa no longer observes DST. -
 Merge more location-based Zones whose timestamps agree since 1970. - Move
 some backward-compatibility links to 'backward'. - Rename Pacific/Enderbury
 to Pacific/Kanton. - Correct many pre-1993 transitions in Malawi, Portugal,
 etc. - zic now creates each output file or link atomically. - zic -L no
 longer omits the POSIX TZ string in its output. - zic fixes for truncation
 and leap second table expiration. - zic now follows POSIX for TZ strings
 using all-year DST. - Fix some localtime crashes and bugs in obscure cases. -
 zdump -v now outputs more-useful boundary cases. - tzfile.5 better matches a
 draft successor to RFC 8536.

---
 .gitignore                    |  2 ++
 0001-Fix-Jan-Mayen-typo.patch | 29 +++++++++++++++++++++++++++++
 sources                       |  4 ++--
 tzdata.spec                   | 26 ++++++++++++++++++++++----
 4 files changed, 55 insertions(+), 6 deletions(-)
 create mode 100644 0001-Fix-Jan-Mayen-typo.patch

diff --git a/.gitignore b/.gitignore
index 6807054..5fd4739 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,3 +184,5 @@ noarch/
 /tzdata2020f.tar.gz
 /tzcode2021a.tar.gz
 /tzdata2021a.tar.gz
+/tzdata2021b.tar.gz
+/tzcode2021b.tar.gz
diff --git a/0001-Fix-Jan-Mayen-typo.patch b/0001-Fix-Jan-Mayen-typo.patch
new file mode 100644
index 0000000..6e60061
--- /dev/null
+++ b/0001-Fix-Jan-Mayen-typo.patch
@@ -0,0 +1,29 @@
+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/sources b/sources
index c532355..46a2486 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45
-SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3
+SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51
+SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806
diff --git a/tzdata.spec b/tzdata.spec
index 50011d6..cf3b1d4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,14 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021a
-%define tzdata_version 2021a
-%define tzcode_version 2021a
-Release: 2%{?dist}
+Version: 2021b
+%define tzdata_version 2021b
+%define tzcode_version 2021b
+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
 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
 %if 0%{?rhel} || 0%{?eln}
 Patch003: 0003-continue-to-ship-posixrules.patch
@@ -41,6 +42,7 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch001 -p1
 %patch002 -p1
 %if 0%{?rhel} || 0%{?eln}
 %patch003 -p1
@@ -151,6 +153,22 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
+- Rebase to tzdata-2021b
+  - Jordan now starts DST on February's last Thursday.
+  - Samoa no longer observes DST.
+  - Merge more location-based Zones whose timestamps agree since 1970.
+  - Move some backward-compatibility links to 'backward'.
+  - Rename Pacific/Enderbury to Pacific/Kanton.
+  - Correct many pre-1993 transitions in Malawi, Portugal, etc.
+  - zic now creates each output file or link atomically.
+  - zic -L no longer omits the POSIX TZ string in its output.
+  - zic fixes for truncation and leap second table expiration.
+  - zic now follows POSIX for TZ strings using all-year DST.
+  - Fix some localtime crashes and bugs in obscure cases.
+  - zdump -v now outputs more-useful boundary cases.
+  - tzfile.5 better matches a draft successor to RFC 8536.
+
 * Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2021a-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 

From 9af28bce5caaac4e2a451da86e57e6117321fd47 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Thu, 7 Oct 2021 13:01:07 -0400
Subject: [PATCH 02/12] Resolves: #2009906 Rebase to tzdata-2021c - Revert most
 2021b changes to the 'backward' file. - Fix 'zic -b fat' bug in pre-1970
 32-bit data reported in tzdata-2021b. - Fix two Link line typos from
 tzdata-2021b. - Distribute the new SECURITY file.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 15 ++++++++++-----
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5fd4739..f8d2c31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -186,3 +186,5 @@ noarch/
 /tzdata2021a.tar.gz
 /tzdata2021b.tar.gz
 /tzcode2021b.tar.gz
+/tzcode2021c.tar.gz
+/tzdata2021c.tar.gz
diff --git a/sources b/sources
index 46a2486..cadbc5d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51
-SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806
+SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad
+SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca
diff --git a/tzdata.spec b/tzdata.spec
index cf3b1d4..9281f56 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021b
-%define tzdata_version 2021b
-%define tzcode_version 2021b
+Version: 2021c
+%define tzdata_version 2021c
+%define tzcode_version 2021c
 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
 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
 %if 0%{?rhel} || 0%{?eln}
 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
 %if 0%{?rhel} || 0%{?eln}
 %patch003 -p1
@@ -153,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Oct 07 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
+- Rebase to tzdata-2021c
+  - Revert most 2021b changes to the 'backward' file.
+  - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b.
+  - Fix two Link line typos from tzdata-2021b.
+  - Distribute the new SECURITY file.
+
 * Sat Sep 25 2021 Patsy Griffin <patsy@redhat.com> - 2021b-1
 - Rebase to tzdata-2021b
   - Jordan now starts DST on February's last Thursday.

From 464f0654a348ec251f82b75070d575e35a5050fc Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Thu, 28 Oct 2021 18:09:06 -0400
Subject: [PATCH 03/12] Resolves: #2014708 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.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++++---
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index f8d2c31..2b69fbf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,3 +188,5 @@ noarch/
 /tzcode2021b.tar.gz
 /tzcode2021c.tar.gz
 /tzdata2021c.tar.gz
+/tzdata2021e.tar.gz
+/tzcode2021e.tar.gz
diff --git a/sources b/sources
index cadbc5d..8307dce 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad
-SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca
+SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
+SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
diff --git a/tzdata.spec b/tzdata.spec
index 9281f56..f8ac5b0 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021c
-%define tzdata_version 2021c
-%define tzcode_version 2021c
+Version: 2021e
+%define tzdata_version 2021e
+%define tzcode_version 2021e
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Oct 26 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.
+
 * Thu Oct 07 2021 Patsy Griffin <patsy@redhat.com> - 2021c-1
 - Rebase to tzdata-2021c
   - Revert most 2021b changes to the 'backward' file.

From 173df5f04f8005b6eec601b5879a4edf511bdbb1 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Wed, 23 Mar 2022 20:01:46 -0400
Subject: [PATCH 04/12] Resolves: #2064770 Rebase to tzdata-2022a - Palestine
 springs forward on 2022-03-27, not 2022-03-26. - zdump -v now outputs better
 failure information. - bug fixes for code that reads corrupted TZif data.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 2b69fbf..5b3a385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -190,3 +190,5 @@ noarch/
 /tzdata2021c.tar.gz
 /tzdata2021e.tar.gz
 /tzcode2021e.tar.gz
+/tzdata2022a.tar.gz
+/tzcode2022a.tar.gz
diff --git a/sources b/sources
index 8307dce..9c44d2d 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
-SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
+SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
+SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
diff --git a/tzdata.spec b/tzdata.spec
index f8ac5b0..699392a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2021e
-%define tzdata_version 2021e
-%define tzcode_version 2021e
+Version: 2022a
+%define tzdata_version 2022a
+%define tzcode_version 2022a
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Wed Mar 23 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
+- Rebase to tzdata-2022a
+  - Palestine springs forward on 2022-03-27, not 2022-03-26.
+  - zdump -v now outputs better failure information.
+  - bug fixes for code that reads corrupted TZif data.
+
 * Tue Oct 26 2021 Patsy Griffin <patsy@redhat.com> - 2021e-1
 - Rebase to tzdata-2021e - supersedes tzdata-2021d
   - Pacific/Fiji suspended DST for the 2021/2022 season.

From 5fe7e3d12af91a5b5d495905c103f2319c79caa6 Mon Sep 17 00:00:00 2001
From: Michal Kolar <mkolar@redhat.com>
Date: Tue, 12 Apr 2022 15:46:56 +0000
Subject: [PATCH 05/12] sync tests/tzdata-checker with main branch

---
 tests/tzdata-checker/runtest.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/tzdata-checker/runtest.sh b/tests/tzdata-checker/runtest.sh
index eedc833..af24c09 100755
--- a/tests/tzdata-checker/runtest.sh
+++ b/tests/tzdata-checker/runtest.sh
@@ -73,12 +73,13 @@ rlJournalStart
 
   rlPhaseStartSetup "Test zdump"
     for zone in `cat zones.int`; do
-      rlRun "./zdump -v -c 1970,$hiyear $zone >ref"
-      if uname -r | egrep -o -q '\.el5'; then  # glibc's zdump is out of sync for RHEL5
+      if rlIsRHEL "<8"; then # glibc's zdump is out of sync for '-v option'
+        rlRun "./zdump -v -c 1970,$hiyear $zone >ref"
         rlRun "./zdump -v -c 1970,$hiyear /usr/share/zoneinfo/$zone >cur"
         sed -i 's|^/usr/share/zoneinfo/||' cur
       else
-        rlRun "zdump -v -c 1970,$hiyear $zone >cur"
+        rlRun "./zdump -V -c 1970,$hiyear $zone >ref"
+        rlRun "zdump -V -c 1970,$hiyear $zone >cur"
       fi
 
       # normalize zdump outputs

From 153daf5f6b03cc535ecc4742a656f0673b150fc0 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Tue, 12 Apr 2022 13:07:20 -0400
Subject: [PATCH 06/12] Rebuild with updates for
 tests/tzdata-checker/runtest.sh.

---
 tzdata.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/tzdata.spec b/tzdata.spec
index 699392a..b5e5393 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2022a
 %define tzdata_version 2022a
 %define tzcode_version 2022a
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
 Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Apr 12 2022 Patsy Griffin <patsy@redhat.com> - 2022a-2
+- Rebuild with updates for tests/tzdata-checker/runtest.sh.
+
 * Wed Mar 23 2022 Patsy Griffin <patsy@redhat.com> - 2022a-1
 - Rebase to tzdata-2022a
   - Palestine springs forward on 2022-03-27, not 2022-03-26.

From 84ea76e429eaf9920d435baec73328b4b8bfe47e Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Sun, 14 Aug 2022 22:47:43 -0400
Subject: [PATCH 07/12] Resolves: #2117429 Rebase to tzdata-2022b - Chile
 transitions to DST on 2022-09-11, not 2022-09-04 - 'make install' now
 defaults LOCALTIME to Factory rather than GMT - More zones that are the same
 since 1970 have been moved to backzone. - Include patch for awk workaround.

---
 .gitignore                       |   2 +
 0001-Work-around-awk-bug-1.patch | 153 +++++++++++++++++++++++++++++++
 sources                          |   4 +-
 tzdata.spec                      |  17 +++-
 4 files changed, 170 insertions(+), 6 deletions(-)
 create mode 100644 0001-Work-around-awk-bug-1.patch

diff --git a/.gitignore b/.gitignore
index 5b3a385..54c10e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -192,3 +192,5 @@ noarch/
 /tzcode2021e.tar.gz
 /tzdata2022a.tar.gz
 /tzcode2022a.tar.gz
+/tzcode2022b.tar.gz
+/tzdata2022b.tar.gz
diff --git a/0001-Work-around-awk-bug-1.patch b/0001-Work-around-awk-bug-1.patch
new file mode 100644
index 0000000..304accc
--- /dev/null
+++ b/0001-Work-around-awk-bug-1.patch
@@ -0,0 +1,153 @@
+From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert@cs.ucla.edu>
+Date: Wed, 10 Aug 2022 18:58:08 -0700
+Subject: [PROPOSED] Work around macOS awk bug
+
+* ziguard.awk: Replace every regular expression /ERE/ in ordinary
+contexts with ($0 ~ /ERE/), to work around a bug in macOS 13.0 awk.
+Problem reported by Deborah Goldsmith in:
+https://mm.icann.org/pipermail/tz/2022-August/031783.html
+---
+ NEWS        |  8 ++++++++
+ ziguard.awk | 37 ++++++++++++++++++++-----------------
+ 2 files changed, 28 insertions(+), 17 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index 6a0d5c50..7291030a 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,5 +1,13 @@
+ News for the tz database
+ 
++Unreleased, experimental changes
++
++  Changes to code
++
++    Work around a bug in macOS 'awk' that broke commands like 'make
++    traditional_tarballs'.  (Problem reported by Deborah Goldsmith.)
++
++
+ Release 2022b - 2022-08-10 15:38:32 -0700
+ 
+   Briefly:
+diff --git a/ziguard.awk b/ziguard.awk
+index 0728baa5..0556cc4a 100644
+--- a/ziguard.awk
++++ b/ziguard.awk
+@@ -91,12 +91,13 @@ $1 == "#PACKRATLIST" && $2 == PACKRATLIST {
+ /^Zone/ { zone = $2 }
+ 
+ DATAFORM != "main" {
+-  in_comment = /^#/
++  in_comment = $0 ~ /^#/
+   uncomment = comment_out = 0
+ 
+   # If this line should differ due to Czechoslovakia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
++  if (zone == "Europe/Prague" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
++      && $0 ~ /1947 Feb 23/) {
+     if (($(in_comment + 2) != "-") == (DATAFORM != "rearguard")) {
+       uncomment = in_comment
+     } else {
+@@ -106,9 +107,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Ireland using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/
++  Rule_Eire = $0 ~ /^#?Rule[\t ]+Eire[\t ]/
+   Zone_Dublin_post_1968 \
+-    = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \
++    = (zone == "Europe/Dublin" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \
+        && (!$(in_comment + 4) || 1968 < $(in_comment + 4)))
+   if (Rule_Eire || Zone_Dublin_post_1968) {
+     if ((Rule_Eire \
+@@ -122,9 +123,9 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Namibia using negative SAVE values,
+   # uncomment the desired version and comment out the undesired one.
+-  Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
++  Rule_Namibia = $0 ~ /^#?Rule[\t ]+Namibia[\t ]/
+   Zone_using_Namibia_rule \
+-    = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
++    = (zone == "Africa/Windhoek" && $0 ~ /^#?[\t ]+[12]:00[\t ]/ \
+        && ($(in_comment + 2) == "Namibia" \
+ 	   || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
+ 	       && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
+@@ -142,8 +143,8 @@ DATAFORM != "main" {
+ 
+   # If this line should differ due to Portugal benefiting from %z if supported,
+   # uncomment the desired version and comment out the undesired one.
+-  if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
+-    if (/%z/ == (DATAFORM == "vanguard")) {
++  if ($0 ~ /^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) {
++    if (($0 ~ /%z/) == (DATAFORM == "vanguard")) {
+       uncomment = in_comment
+     } else {
+       comment_out = !in_comment
+@@ -164,8 +165,8 @@ DATAFORM != "main" {
+     sub(/-00CHANGE-TO-%z/, "-00")
+     sub(/[-+][^\t ]+CHANGE-TO-/, "")
+   } else {
+-    if (/^[^#]*%z/) {
+-      stdoff_column = 2 * /^Zone/ + 1
++    if ($0 ~ /^[^#]*%z/) {
++      stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+       rules_column = stdoff_column + 1
+       stdoff = get_minutes($stdoff_column)
+       rules = $rules_column
+@@ -184,9 +185,9 @@ DATAFORM != "main" {
+ 	    dstoff = 20
+ 	  } else if (((rules == "Cook" || rules == "LH") && NF == 3) \
+ 		     || (rules == "Uruguay" \
+-			 && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
++			 && $0 ~ /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) {
+ 	    dstoff = 30
+-	  } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) {
++	  } else if (rules == "Uruguay" && $0 ~ /[\t ]1974 Mar 10$/) {
+ 	    dstoff = 90
+ 	  } else {
+ 	    dstoff = 60
+@@ -222,7 +223,7 @@ DATAFORM != "main" {
+       stdoff_subst[1] = rounded_stdoff
+     }
+   } else if (stdoff_subst[0]) {
+-    stdoff_column = 2 * /^Zone/ + 1
++    stdoff_column = 2 * ($0 ~ /^Zone/) + 1
+     stdoff_column_val = $stdoff_column
+     if (stdoff_column_val == stdoff_subst[0]) {
+       sub(stdoff_subst[0], stdoff_subst[1])
+@@ -233,7 +234,7 @@ DATAFORM != "main" {
+ 
+   # In rearguard form, change the Japan rule line with "Sat>=8 25:00"
+   # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
+-  if (/^Rule/ && $2 == "Japan") {
++  if ($0 ~ /^Rule/ && $2 == "Japan") {
+     if (DATAFORM == "rearguard") {
+       if ($7 == "Sat>=8" && $8 == "25:00") {
+ 	sub(/Sat>=8/, "Sun>=9")
+@@ -250,7 +251,7 @@ DATAFORM != "main" {
+   # In rearguard form, change the Morocco lines with negative SAVE values
+   # to use positive SAVE values.
+   if ($2 == "Morocco") {
+-    if (/^Rule/) {
++    if ($0 ~ /^Rule/) {
+       if ($4 ~ /^201[78]$/ && $6 == "Oct") {
+ 	if (DATAFORM == "rearguard") {
+ 	  sub(/\t2018\t/, "\t2017\t")
+@@ -290,8 +291,10 @@ DATAFORM != "main" {
+ /^Zone/ {
+   packrat_ignored = FILENAME == PACKRATDATA && PACKRATLIST && !packratlist[$2];
+ }
+-packrat_ignored && !/^Rule/ {
+-  sub(/^/, "#")
++{
++  if (packrat_ignored && $0 !~ /^Rule/) {
++    sub(/^/, "#")
++  }
+ }
+ 
+ # If a Link line is followed by a Link or Zone line for the same data, comment
+-- 
+2.34.1
+
diff --git a/sources b/sources
index 9c44d2d..6d8aeed 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
-SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
+SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
+SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
diff --git a/tzdata.spec b/tzdata.spec
index b5e5393..27fc280 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,14 +1,15 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022a
-%define tzdata_version 2022a
-%define tzcode_version 2022a
-Release: 2%{?dist}
+Version: 2022b
+%define tzdata_version 2022b
+%define tzcode_version 2022b
+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
 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 
+Patch001: 0001-Work-around-awk-bug-1.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 %if 0%{?rhel} || 0%{?eln}
 Patch003: 0003-continue-to-ship-posixrules.patch
@@ -41,6 +42,7 @@ This package contains timezone information for use by Java runtimes.
 %prep
 %setup -q -c -a 1
 
+%patch001 -p1
 %patch002 -p1
 %if 0%{?rhel} || 0%{?eln}
 %patch003 -p1
@@ -151,6 +153,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Aug 14 2022 Patsy Griffin <patsy@redhat.com> - 2022b-1
+- Rebase to tzdata-2022b
+  - Chile transitions to DST on 2022-09-11, not 2022-09-04
+  - 'make install' now defaults LOCALTIME to Factory rather than GMT
+  - More zones that are the same since 1970 have been moved to backzone.
+  - Include patch for awk workaround.
+
 * Tue Apr 12 2022 Patsy Griffin <patsy@redhat.com> - 2022a-2
 - Rebuild with updates for tests/tzdata-checker/runtest.sh.
 

From 7aca44a56a2f7e161357ce4e608b3f1cc66828b2 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Mon, 22 Aug 2022 21:12:32 -0400
Subject: [PATCH 08/12] Resolves: #2118513 Rebase to tzdata-2022c - supersedes
 tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS, etc. -
 Improve tzselect with respect to intercontinental Zones.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 13 ++++++++-----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54c10e2..a9051fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,5 @@ noarch/
 /tzcode2022a.tar.gz
 /tzcode2022b.tar.gz
 /tzdata2022b.tar.gz
+/tzcode2022c.tar.gz
+/tzdata2022c.tar.gz
diff --git a/sources b/sources
index 6d8aeed..7e121c7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79
-SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1
+SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
+SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
diff --git a/tzdata.spec b/tzdata.spec
index 27fc280..95cc8b8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,15 +1,14 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022b
-%define tzdata_version 2022b
-%define tzcode_version 2022b
+Version: 2022c
+%define tzdata_version 2022c
+%define tzcode_version 2022c
 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
 Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 
-Patch001: 0001-Work-around-awk-bug-1.patch
 Patch002: 0002-Fix-have-snprintf-error.patch
 %if 0%{?rhel} || 0%{?eln}
 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
 %if 0%{?rhel} || 0%{?eln}
 %patch003 -p1
@@ -153,6 +151,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Aug 22 2022 Patsy Griffin <patsy@redhat.com> - 2022c-1
+- Rebase to tzdata-2022c - supersedes tzdata-2022b
+  - Add a work-around for an awk bug in FreeBSD, macOS, etc.
+  - Improve tzselect with respect to intercontinental Zones.
+
 * Sun Aug 14 2022 Patsy Griffin <patsy@redhat.com> - 2022b-1
 - Rebase to tzdata-2022b
   - Chile transitions to DST on 2022-09-11, not 2022-09-04

From 7b2a3aa21dbaa6f5e8eb38a44c2d8d3e90292857 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Sun, 25 Sep 2022 21:43:19 -0400
Subject: [PATCH 09/12] Resolves: #2129499 Rebase to tzdata-2022d - Palestine
 DST transition will be on October 29, 2022,   not October 28, 2022. -
 Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index a9051fd..72d6e02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -196,3 +196,5 @@ noarch/
 /tzdata2022b.tar.gz
 /tzcode2022c.tar.gz
 /tzdata2022c.tar.gz
+/tzcode2022d.tar.gz
+/tzdata2022d.tar.gz
diff --git a/sources b/sources
index 7e121c7..c1e5897 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
-SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
+SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2
+SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30
diff --git a/tzdata.spec b/tzdata.spec
index 95cc8b8..e901f0a 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022c
-%define tzdata_version 2022c
-%define tzcode_version 2022c
+Version: 2022d
+%define tzdata_version 2022d
+%define tzcode_version 2022d
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Sun Sep 25 2022 Patsy Griffin <patsy@redhat.com> - 2022d-1
+- Rebase to tzdata-2022d
+  - Palestine DST transition will be on October 29, 2022,
+    not October 28, 2022.
+  - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'.
+
 * Mon Aug 22 2022 Patsy Griffin <patsy@redhat.com> - 2022c-1
 - Rebase to tzdata-2022c - supersedes tzdata-2022b
   - Add a work-around for an awk bug in FreeBSD, macOS, etc.

From 87caa011f84d12899a2627a8535346557d030109 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Fri, 14 Oct 2022 15:49:43 -0400
Subject: [PATCH 10/12] Resolves: #2134955 Rebase to tzdata-2022e - Jordan and
 Syria cancelled the DST transition planned   for 2022-10-28, remaining at +03
 permanently.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 11 ++++++++---
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 72d6e02..e74b631 100644
--- a/.gitignore
+++ b/.gitignore
@@ -198,3 +198,5 @@ noarch/
 /tzdata2022c.tar.gz
 /tzcode2022d.tar.gz
 /tzdata2022d.tar.gz
+/tzcode2022e.tar.gz
+/tzdata2022e.tar.gz
diff --git a/sources b/sources
index c1e5897..db1eaf4 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2
-SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30
+SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060
+SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da
diff --git a/tzdata.spec b/tzdata.spec
index e901f0a..4c808a4 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022d
-%define tzdata_version 2022d
-%define tzcode_version 2022d
+Version: 2022e
+%define tzdata_version 2022e
+%define tzcode_version 2022e
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Oct 14 2022 Patsy Griffin <patsy@redhat.com> - 2022e-1
+- Rebase to tzdata-2022e
+  - Jordan and Syria cancelled the DST transition planned
+    for 2022-10-28, remaining at +03 permanently.
+
 * Sun Sep 25 2022 Patsy Griffin <patsy@redhat.com> - 2022d-1
 - Rebase to tzdata-2022d
   - Palestine DST transition will be on October 29, 2022,

From c7c4c33a66f28b0dcfc90bb2add064985f02ef5e Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Mon, 31 Oct 2022 00:02:56 -0400
Subject: [PATCH 11/12] Resolves: #2138478 Rebase to tzdata-2022f - Mexico will
 stop observing DST except near the US border. - Chihuahua moved to -06 year
 round starting on 2022-10-30. - Fiji no longer observes DST.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 12 +++++++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index e74b631..b8caba0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -200,3 +200,5 @@ noarch/
 /tzdata2022d.tar.gz
 /tzcode2022e.tar.gz
 /tzdata2022e.tar.gz
+/tzcode2022f.tar.gz
+/tzdata2022f.tar.gz
diff --git a/sources b/sources
index db1eaf4..48b67f7 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060
-SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da
+SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
+SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
diff --git a/tzdata.spec b/tzdata.spec
index 4c808a4..f642dcc 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022e
-%define tzdata_version 2022e
-%define tzcode_version 2022e
+Version: 2022f
+%define tzdata_version 2022f
+%define tzcode_version 2022f
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Mon Oct 31 2022 Patsy Griffin <patsy@redhat.com> - 2022f-1
+- Rebase to tzdata-2022f
+  - Mexico will stop observing DST except near the US border.
+  - Chihuahua moved to -06 year round starting on 2022-10-30.
+  - Fiji no longer observes DST.
+
 * Fri Oct 14 2022 Patsy Griffin <patsy@redhat.com> - 2022e-1
 - Rebase to tzdata-2022e
   - Jordan and Syria cancelled the DST transition planned

From fd11efcedbd44dd205b72814407e2a9095226ac4 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Fri, 2 Dec 2022 12:00:44 -0500
Subject: [PATCH 12/12] Resolves: #2149397 Rebase to tzdata-2022g - The
 northern edge of the Mexican state of Chihuahua will   change time zone to
 agree with nearby US locations on   2022-11-30. - Added a new Zone
 America/Ciudad_Juarez that splits from   America/Ojinaga.

---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 14 +++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b8caba0..3bb63b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -202,3 +202,5 @@ noarch/
 /tzdata2022e.tar.gz
 /tzcode2022f.tar.gz
 /tzdata2022f.tar.gz
+/tzcode2022g.tar.gz
+/tzdata2022g.tar.gz
diff --git a/sources b/sources
index 48b67f7..253accf 100644
--- a/sources
+++ b/sources
@@ -1,4 +1,4 @@
 SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b
-SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6
+SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a
+SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65
diff --git a/tzdata.spec b/tzdata.spec
index f642dcc..e2fe697 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2022f
-%define tzdata_version 2022f
-%define tzcode_version 2022f
+Version: 2022g
+%define tzdata_version 2022g
+%define tzcode_version 2022g
 Release: 1%{?dist}
 License: Public Domain
 URL: https://www.iana.org/time-zones
@@ -151,6 +151,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Fri Dec 02 2022 Patsy Griffin <patsy@redhat.com> - 2022g-1
+- Rebase to tzdata-2022g
+  - The northern edge of the Mexican state of Chihuahua will
+    change time zone to agree with nearby US locations on
+    2022-11-30.
+  - Added a new Zone America/Ciudad_Juarez that splits from
+    America/Ojinaga.
+
 * Mon Oct 31 2022 Patsy Griffin <patsy@redhat.com> - 2022f-1
 - Rebase to tzdata-2022f
   - Mexico will stop observing DST except near the US border.