diff --git a/.gitignore b/.gitignore index 46da8c6..7f0b4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,13 @@ noarch/ /tzdata2022f.tar.gz /tzcode2022g.tar.gz /tzdata2022g.tar.gz +/tzcode2023a.tar.gz +/tzdata2023a.tar.gz +/tzcode2023b.tar.gz +/tzdata2023b.tar.gz +/tzcode2023c.tar.gz +/tzdata2023c.tar.gz +/tzcode2023d.tar.gz +/tzdata2023d.tar.gz +/tzcode2024a.tar.gz +/tzdata2024a.tar.gz diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch index cafdf4d..082bb5c 100644 --- a/0002-Fix-have-snprintf-error.patch +++ b/0002-Fix-have-snprintf-error.patch @@ -1,12 +1,12 @@ diff -Nrup a/Makefile b/Makefile ---- a/Makefile 2017-10-23 18:03:40.237177646 -0400 -+++ b/Makefile 2017-10-23 18:06:20.060683518 -0400 -@@ -292,7 +292,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn - # January's first Monday when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. +--- a/Makefile 2024-01-01 17:57:30.112884304 -0500 ++++ b/Makefile 2024-01-01 17:59:33.641497622 -0500 +@@ -423,6 +423,7 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fn + # Uncomment the following line and edit its contents as needed. --CFLAGS= + #CFLAGS= -O 1 +CFLAGS= -DHAVE_SNPRINTF=1 - # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to release 2012h and earlier. + + # The name of a POSIX-like library archiver, its flags, C compiler, +Binary files a/tzdata2023d-rearguard.tar.gz and b/tzdata2023d-rearguard.tar.gz differ diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch index 1755352..fa905d3 100644 --- a/0003-continue-to-ship-posixrules.patch +++ b/0003-continue-to-ship-posixrules.patch @@ -1,13 +1,13 @@ diff -Nrup a/Makefile b/Makefile ---- a/Makefile 2020-10-13 15:58:12.000000000 -0400 -+++ b/Makefile 2020-10-13 16:03:09.461302282 -0400 -@@ -60,7 +60,7 @@ LOCALTIME= GMT +--- a/Makefile 2023-03-22 17:41:49.069789592 -0400 ++++ b/Makefile 2023-03-22 17:44:07.528427093 -0400 +@@ -52,7 +52,7 @@ LOCALTIME= Factory # make zonenames # to get a list of the values you can use for POSIXRULES. -POSIXRULES= - -+POSIXRULES= America/New_York ++POSIXRULES= America/New_York # Also see TZDEFRULESTRING below, which takes effect only - # if the time zone files cannot be accessed. -Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ + # if POSIXRULES is '-' or if the template file cannot be accessed. +Binary files a/tzdata2023a-rearguard.tar.gz and b/tzdata2023a-rearguard.tar.gz differ diff --git a/plans/ci.fmf b/plans/ci.fmf index 1ad2c12..3fd3ab7 100644 --- a/plans/ci.fmf +++ b/plans/ci.fmf @@ -1,6 +1,5 @@ summary: CI Gating Plan discover: how: fmf - directory: tests execute: - how: beakerlib + how: tmt diff --git a/sources b/sources index 253accf..2fb4af3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a -SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 +SHA512 (tzcode2024a.tar.gz) = 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c +SHA512 (tzdata2024a.tar.gz) = 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 diff --git a/tzdata.spec b/tzdata.spec index 50f1830..aa51c5e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2022g -%define tzdata_version 2022g -%define tzcode_version 2022g -Release: 2%{?dist} +Version: 2024a +%define tzdata_version 2024a +%define tzcode_version 2024a +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 @@ -43,9 +43,9 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 -%patch002 -p1 +%patch -p1 -P 2 %if 0%{?rhel} || 0%{?eln} -%patch003 -p1 +%patch -p1 -P 3 %endif # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. @@ -65,11 +65,11 @@ tar zxf rearguard/tzdata%{version}-rearguard.tar.gz mkdir javazic tar zxf %{SOURCE3} -C javazic pushd javazic -%patch100 -%patch101 -%patch102 -%patch103 -%patch104 +%patch -P 100 +%patch -P 101 +%patch -P 102 +%patch -P 103 +%patch -P 104 # Hack alert! sun.tools may be defined and installed in the # VM. In order to guarantee that we are using IcedTea/OpenJDK @@ -153,6 +153,34 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Feb 05 2024 Patsy Griffin - 2024a-1 +- Rebase to tzdata-2024a + - Kazakhstan will transition from UTC+6 to UTC+5 on 2024-03-01. + - Palestine will spring forward a week later than previously + predicted. + +* Wed Jan 03 2024 Patsy Griffin - 2023d-1 +- Rebase to tzdata-2023d + - Include time zone changes for Ittoqqortoormiit, Greenland + and Vostok, Antarctica. + - Update the expiration date for the leap-seconds.list file. + No new leap seconds were added. +- Use the new syntax for the %%patch macro. + +* Wed Mar 29 2023 Patsy Griffin - 2023c-1 +- Rebase to tzdata-2023c + - Reinstate Lebanon DST change effective March 25. + +* Fri Mar 24 2023 Patsy Griffin - 2023b-1 +- Rebase to tzdata-2023b + - Lebanon will transition to DST on April 20/21, not March 25/26. + +* Thu Mar 23 2023 Patsy Griffin - 2023a-1 +- Rebase to tzdata-2023a + - Egypt reintroduced DST, from April through October. + - Morocco springs forward April 23, not April 30. + - Palestine delayed the start of DST this year. + * Sat Jan 21 2023 Fedora Release Engineering - 2022g-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild