From b7202ae10c9e1598b4d3225a599ee4afff1ed52a Mon Sep 17 00:00:00 2001
From: Patsy Griffin <patsy@redhat.com>
Date: Thu, 23 Jan 2025 11:25:38 -0500
Subject: [PATCH] Update to tzdata-2025a

  - Paraguay is now permanently at -03. This impacts timestamps
    starting on 2025-03-22.
  - Includes improvements to pre-1991 data for the Philippines.
  - Etc/Unknown is now reserved.

Resolves: RHEL-74296
---
 .gitignore  |  2 ++
 sources     |  4 ++--
 tzdata.spec | 17 ++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index aa2e596..b8aabb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -216,3 +216,5 @@ noarch/
 /tzdata2024a.tar.gz
 /tzcode2024b.tar.gz
 /tzdata2024b.tar.gz
+/tzcode2025a.tar.gz
+/tzdata2025a.tar.gz
diff --git a/sources b/sources
index 5da42b3..b1d9bf5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204
-SHA512 (tzcode2024b.tar.gz) = 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026
-SHA512 (tzdata2024b.tar.gz) = 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193
+SHA512 (tzcode2025a.tar.gz) = 308f6a3d6ebfa18446f8296e5c799e18dccecd79ace3ba004d3f233892c7428faae152b217b22d229c59dd4e0faafee797d8b3583b58fa982b81f7cc7347f502
+SHA512 (tzdata2025a.tar.gz) = 93b8f939d39bdfe451e262666f9099c529c96c49d14c08e3611560ca660e12e16d08a22b145d615e00570fb194881618d6f9a0a617c119ab447be03279d747c3
diff --git a/tzdata.spec b/tzdata.spec
index d5034a6..657dac5 100644
--- a/tzdata.spec
+++ b/tzdata.spec
@@ -1,8 +1,8 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2024b
-%define tzdata_version 2024b
-%define tzcode_version 2024b
+Version: 2025a
+%define tzdata_version 2025a
+%define tzcode_version 2025a
 Release: 1%{?dist}
 License: LicenseRef-Fedora-Public-Domain AND (GPL-2.0-only WITH ClassPath-exception-2.0)
 URL: https://www.iana.org/time-zones
@@ -11,8 +11,6 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
 
 Patch002: 0002-Fix-have-snprintf-error.patch
 Patch003: 0003-continue-to-ship-posixrules.patch
-Patch004: 0004-Fix-Apr-vs-April-2024b.patch
-Patch005: 0005-Improve-style-checks-for-months-2024b.patch
 
 BuildRequires: make
 BuildRequires: gcc
@@ -44,8 +42,6 @@ This package contains timezone information for use by Java runtimes.
 %if 0%{?rhel}
 %patch -p1 -P 3
 %endif
-%patch -p1 -P 4
-%patch -p1 -P 5
 
 # tzdata-2018g introduced 25:00 transition times.  This breaks OpenJDK.
 # Use rearguard for java
@@ -141,6 +137,13 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Jan 21 2025 Patsy Griffin <pats@redhat.com> - 2025a-1
+  Update to tzdata-2025a (RHEL-74296)
+  - Paraguay is now permanently at -03. This impacts timestamps
+    starting on 2025-03-22.
+  - Includes improvements to pre-1991 data for the Philippines.
+  - Etc/Unknown is now reserved.
+
 * Tue Jan 07 2025 Patsy Griffin <patsy@redhat.com> - 2024b-1
 - Update to tzdata-2024b
   - Improve historical data for Mexico, Mongolia, and Portugal.