From 26f35410f102f9821ac8d20bfb29bfc574113978 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Thu, 14 Mar 2024 12:41:57 -0400
Subject: [PATCH] Resolves: RHEL-26860 - Add java patch to fix incorrect
 calculations for   Africa/Casablanca starting in 2027. (RHEL-26860)

---
 8051641.patch | 17 +++++++++++++++++
 tzdata.spec   |  8 +++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 8051641.patch

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/tzdata.spec b/tzdata.spec
index 692f61a..4161100 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2024a
 %define tzdata_version 2024a
 %define tzcode_version 2024a
-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
@@ -34,6 +34,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.
@@ -82,6 +83,7 @@ find . -type f -name '*.java' -print0 \
 popd
 
 tar xf %{SOURCE4}
+%patch105
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -151,6 +153,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Mar 14 2024 Patsy Griffin <patsy@redhat.com> - 2024a-2
+- Add java patch to fix incorrect calculations for
+  Africa/Casablanca starting in 2027. (RHEL-26860)
+
 * Thu Feb 01 2024 Patsy Griffin <patsy@redhat.com> - 2024a-1
 - Rebase to tzdata-2024a
   - Kazakhstan will transition from UTC+6 to UTC+5 on 2024-03-01.