import UBI tzdata-2025a-1.el9

.gitignore

@@ -1,4 +1,4 @@
 SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 SOURCES/javazic.tar.gz
-SOURCES/tzcode2024b.tar.gz
+SOURCES/tzcode2025a.tar.gz
-SOURCES/tzdata2024b.tar.gz
+SOURCES/tzdata2025a.tar.gz

.tzdata.metadata

@@ -1,4 +1,4 @@
 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz
 ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz
-95cfb1106f60e925f0255d340350ba4be51b9b29 SOURCES/tzcode2024b.tar.gz
+31e24f86fda44de2409c8d49708c2145f1ed8030 SOURCES/tzcode2025a.tar.gz
-52adf39a4b3c29502866167e78b89b20fd08dc3e SOURCES/tzdata2024b.tar.gz
+e5b9eeb4388c91e462447cafb342d6584243f546 SOURCES/tzdata2025a.tar.gz

SOURCES/0004-Fix-Apr-vs-April-2024b.patch

@@ -1,23 +0,0 @@
-commit 926b507fa5c3192b1b68fab5910cbd3ba9377c97
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Thu Sep 5 14:36:02 2024 -0700
-
-    "Apr", not "April", in IN column
-    
-    * northamerica (Rule): Use "Apr", not "April", in the IN column.
-    Both forms are valid, but "Apr" is more consistent.
-    Problem reported by Howard Hinnant.
-
-diff --git a/northamerica b/northamerica
-index 01f392e0..1af874b6 100644
---- a/northamerica
-+++ b/northamerica
-@@ -2631,7 +2631,7 @@ Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
- # http://puentelibre.mx/noticia/ciudad_juarez_cambio_horario_noviembre_2022/
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
--Rule	Mexico	1931	only	-	April	30	0:00	1:00	D
-+Rule	Mexico	1931	only	-	Apr	30	0:00	1:00	D
- Rule	Mexico	1931	only	-	Oct	1	0:00	0	S
- Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
- Rule	Mexico	1939	only	-	Jun	25	0:00	0	S

SOURCES/0005-Improve-style-checks-for-months-2024b.patch

@@ -1,77 +0,0 @@
-commit 7b6fb155cadd5e5ee70b55c2770e1bdd2f5d2a38
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date:   Thu Sep 5 14:38:35 2024 -0700
-
-    Improve style checks for months
-    
-    * checktab.awk: Check style of STDOFF and month names.
-
-diff --git a/checktab.awk b/checktab.awk
-index 9a26e465..15a3a697 100644
---- a/checktab.awk
-+++ b/checktab.awk
-@@ -9,6 +9,19 @@ BEGIN {
- 	if (!zone_table) zone_table = "zone1970.tab"
- 	if (!want_warnings) want_warnings = -1
- 
-+	monthabbr["Jan"] = 1
-+	monthabbr["Feb"] = 1
-+	monthabbr["Mar"] = 1
-+	monthabbr["Apr"] = 1
-+	monthabbr["May"] = 1
-+	monthabbr["Jun"] = 1
-+	monthabbr["Jul"] = 1
-+	monthabbr["Aug"] = 1
-+	monthabbr["Sep"] = 1
-+	monthabbr["Oct"] = 1
-+	monthabbr["Nov"] = 1
-+	monthabbr["Dec"] = 1
-+
- 	while (getline <iso_table) {
- 		iso_NR++
- 		if ($0 ~ /^#/) continue
-@@ -128,12 +141,14 @@ BEGIN {
- $1 ~ /^#/ { next }
- 
- {
--	tz = rules = ""
-+	tz = rules = stdoff = ""
- 	if ($1 == "Zone") {
- 		tz = $2
-+		stdoff = $3
- 		ruleUsed[$4] = 1
- 		if ($5 ~ /%/) rulePercentUsed[$4] = 1
--	} else if ($1 == "Link" && zone_table == "zone.tab") {
-+	} else if ($1 == "Link") {
-+	    if (zone_table == "zone.tab") {
- 		# Ignore Link commands if source and destination basenames
- 		# are identical, e.g. Europe/Istanbul versus Asia/Istanbul.
- 		src = $2
-@@ -141,13 +156,27 @@ $1 ~ /^#/ { next }
- 		while ((i = index(src, "/"))) src = substr(src, i+1)
- 		while ((i = index(dst, "/"))) dst = substr(dst, i+1)
- 		if (src != dst) tz = $3
-+	    }
- 	} else if ($1 == "Rule") {
- 		ruleDefined[$2] = 1
- 		if ($10 != "-") ruleLetters[$2] = 1
-+		if (!monthabbr[$6]) {
-+		  printf "%s:%d: tricky month: %s\n", FILENAME, FNR, $6 \
-+			  >>"/dev/stderr"
-+		  status = 1
-+		}
- 	} else {
-+		stdoff = $1
- 		ruleUsed[$2] = 1
- 		if ($3 ~ /%/) rulePercentUsed[$2] = 1
- 	}
-+
-+	if (stdoff && stdoff !~ /^\-?1?[0-9](:[0-5][0-9](:[0-5][0-9])?)?$/) {
-+		printf "%s:%d: unlikely STDOFF: %s\n", FILENAME, FNR, stdoff \
-+			>>"/dev/stderr"
-+		status = 1
-+	}
-+
- 	if (tz && tz ~ /\// && tz !~ /^Etc\//) {
- 		if (!tztab[tz] && FILENAME != "backward" \
- 		    && zone_table != "zonenow.tab") {

SPECS/tzdata.spec

@@ -1,9 +1,9 @@
 Summary: Timezone data
 Name: tzdata
-Version: 2024b
+Version: 2025a
-%define tzdata_version 2024b
+%define tzdata_version 2025a
-%define tzcode_version 2024b
+%define tzcode_version 2025a
-Release: 2%{?dist}
+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
@@ -13,8 +13,6 @@ Patch002: 0002-Fix-have-snprintf.patch
 %if 0%{?rhel} || 0%{?eln}
 Patch003: 0003-continue-to-ship-posixrules.patch
 %endif
-Patch004: 0004-Fix-Apr-vs-April-2024b.patch
-Patch005: 0005-Improve-style-checks-for-months-2024b.patch
 
 BuildRequires: make
 BuildRequires: gcc
@@ -51,8 +49,6 @@ This package contains timezone information for use by Java runtimes.
 %if 0%{?rhel} || 0%{?eln}
 %patch003 -p1
 %endif
-%patch004 -p1
-%patch005 -p1
 
 # tzdata-2018g introduced 25:00 transition times.  This breaks OpenJDK.
 # Use rearguard for java
@@ -122,7 +118,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
 
 # Java 6/7 tzdata
 pushd javazic
-javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java`
+javac -classpath . `find . -name \*.java`
 popd
 
 java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
@@ -180,6 +176,16 @@ echo ============END TESTING===========
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Jan 21 2025 Patsy Griffin <pats@redhat.com> - 2025a-1
+  Update to tzdata-2025a (RHEL-74308)
+  - 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.
+
+* Fri Dec 06 2024 Patsy Griffin <patsy@redhat.com> - 2024b-3
+- Don't use -source 1.6 and -target 1.6 with javac.  (RHEL-70308)
+
 * Fri Sep 27 2024 Patsy Griffin <patsy@redhat.com> - 2024b-2
 - Harden against links to removed zones (RHEL-60063)