From 7553f7a9ce43f7666a875c12360857114880e974 Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Apr 09 2024 02:32:07 +0000
Subject: Resolves: #2266311

- Add java patch to fix incorrect calculations for
  Africa/Casablanca starting in 2027.

---

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 4f7c4f7..c2d37a8 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -3,7 +3,7 @@ Name: tzdata
 Version: 2024a
 %define tzdata_version 2024a
 %define tzcode_version 2024a
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0)
 URL: https://www.iana.org/time-zones
 Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@@ -27,6 +27,7 @@ the world.
 %package java
 Summary: Timezone data for Java
 Source3: javazic-1.8-37392f2f5d59.tar.xz
+Patch100: 8051641.patch
 
 %description java
 This package contains timezone information for use by Java runtimes.
@@ -54,6 +55,7 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz
 %endif
 
 tar xf %{SOURCE3}
+%patch -P 100
 
 echo "%{name}%{tzdata_version}" >> VERSION
 
@@ -112,6 +114,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Apr 04 2024 Patsy Griffin <patsy@redhat.com> - 2024a-5
+- Add java patch to fix incorrect calculations for
+  Africa/Casablanca starting in 2027. (#2266311)
+
 * Sat Mar 02 2024 Andrew Hughes <gnu.andrew@redhat.com> - 2024a-4
 - Remove hardcoded versioned path to javac