diff --git a/.gitignore b/.gitignore index e2fa658..c68c734 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/javazic-1.8-37392f2f5d59.tar.xz SOURCES/javazic.tar.gz -SOURCES/tzcode2024b.tar.gz -SOURCES/tzdata2024b.tar.gz +SOURCES/tzcode2025a.tar.gz +SOURCES/tzdata2025a.tar.gz diff --git a/.tzdata.metadata b/.tzdata.metadata index 082ae9d..70d14df 100644 --- a/.tzdata.metadata +++ b/.tzdata.metadata @@ -1,4 +1,4 @@ 77292e1839952807567570118e01405b405af80c SOURCES/javazic-1.8-37392f2f5d59.tar.xz ee8ad215161cd132e65e2be447b279457158b540 SOURCES/javazic.tar.gz -95cfb1106f60e925f0255d340350ba4be51b9b29 SOURCES/tzcode2024b.tar.gz -52adf39a4b3c29502866167e78b89b20fd08dc3e SOURCES/tzdata2024b.tar.gz +31e24f86fda44de2409c8d49708c2145f1ed8030 SOURCES/tzcode2025a.tar.gz +e5b9eeb4388c91e462447cafb342d6584243f546 SOURCES/tzdata2025a.tar.gz diff --git a/SOURCES/0004-Fix-Apr-vs-April-2024b.patch b/SOURCES/0004-Fix-Apr-vs-April-2024b.patch deleted file mode 100644 index 7c3d161..0000000 --- a/SOURCES/0004-Fix-Apr-vs-April-2024b.patch +++ /dev/null @@ -1,23 +0,0 @@ -commit 926b507fa5c3192b1b68fab5910cbd3ba9377c97 -Author: Paul Eggert -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 diff --git a/SOURCES/0005-Improve-style-checks-for-months-2024b.patch b/SOURCES/0005-Improve-style-checks-for-months-2024b.patch deleted file mode 100644 index b02b882..0000000 --- a/SOURCES/0005-Improve-style-checks-for-months-2024b.patch +++ /dev/null @@ -1,77 +0,0 @@ -commit 7b6fb155cadd5e5ee70b55c2770e1bdd2f5d2a38 -Author: Paul Eggert -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 >"/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") { diff --git a/SPECS/tzdata.spec b/SPECS/tzdata.spec index 17eb9fb..ab5a13e 100644 --- a/SPECS/tzdata.spec +++ b/SPECS/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2024b -%define tzdata_version 2024b -%define tzcode_version 2024b -Release: 4%{?dist} +Version: 2025a +%define tzdata_version 2025a +%define tzcode_version 2025a +Release: 1%{?dist} License: Public Domain Group: System Environment/Base URL: https://www.iana.org/time-zones @@ -12,8 +12,6 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz Patch002: 0002-Fix-have-snprintf.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: gawk, glibc, perl-interpreter BuildRequires: java-devel @@ -49,8 +47,6 @@ This package contains timezone information for use by Java runtimes. %patch002 -p1 %patch003 -p1 -%patch004 -p1 -%patch005 -p1 # Currently tzdata is providing the "rearguard" data set for maximum # compatibility with existing Red Hat Enterprise Linux installs. Future releases of @@ -172,6 +168,13 @@ echo ============END TESTING=========== %{_datadir}/javazi-1.8 %changelog +* Tue Jan 21 2025 Patsy Griffin - 2025a-1 + Update to tzdata-2025a (RHEL-74309) + - 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. + * Wed Oct 09 2024 Patsy Griffin - 2024b-4 - Bump release and rebuild to fix a build issue.