From 1e42af3091ef7003d1fbc0384386a5962ed4a51d Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 3 Jan 2024 16:32:45 -0500 Subject: [PATCH 1/3] Resolves: #2255598 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. --- .gitignore | 2 ++ 0002-Fix-have-snprintf-error.patch | 16 ++++++++-------- sources | 4 ++-- tzdata.spec | 30 +++++++++++++++++++----------- 4 files changed, 31 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index a323947..6c56e99 100644 --- a/.gitignore +++ b/.gitignore @@ -210,3 +210,5 @@ noarch/ /tzdata2023b.tar.gz /tzcode2023c.tar.gz /tzdata2023c.tar.gz +/tzcode2023d.tar.gz +/tzdata2023d.tar.gz diff --git a/0002-Fix-have-snprintf-error.patch b/0002-Fix-have-snprintf-error.patch index cafdf4d..b3dab7f 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/sources b/sources index 35c485b..ac5e342 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 -SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 +SHA512 (tzcode2023d.tar.gz) = 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b +SHA512 (tzdata2023d.tar.gz) = 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4 diff --git a/tzdata.spec b/tzdata.spec index 3f30ef6..ee6b537 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,9 +1,9 @@ Summary: Timezone data Name: tzdata -Version: 2023c -%define tzdata_version 2023c -%define tzcode_version 2023c -Release: 2%{?dist} +Version: 2023d +%define tzdata_version 2023d +%define tzcode_version 2023d +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 @@ -41,9 +41,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} -%patch003 -p1 +%patch -p1 -P 3 %endif # tzdata-2018g introduced 25:00 transition times. This breaks OpenJDK. @@ -63,11 +63,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 @@ -151,6 +151,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* 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. + * Sat Jul 22 2023 Fedora Release Engineering - 2023c-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 70a33315a9b19502eced6b4ff7ccc2693253bec3 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 6 Feb 2024 12:50:24 -0500 Subject: [PATCH 2/3] Resolves: #226312 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. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6c56e99..7f0b4c6 100644 --- a/.gitignore +++ b/.gitignore @@ -212,3 +212,5 @@ noarch/ /tzdata2023c.tar.gz /tzcode2023d.tar.gz /tzdata2023d.tar.gz +/tzcode2024a.tar.gz +/tzdata2024a.tar.gz diff --git a/sources b/sources index ac5e342..2fb4af3 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023d.tar.gz) = 3994a5a060a7a5fffc6585f5191cf7679f9f9be44dbcee4d67d0e42c5b6020c308cb55caf8bf8d51554697665105a174cb470c8c4fc069438350f3bac725709b -SHA512 (tzdata2023d.tar.gz) = 81832b2d738c28cecbcb3906cc07568c5ae574adc9de35b25d4bf613581c92d471d67213b4261a56f0ec02efcf211b4e298b7e1dc367c972e726b0a2e9498df4 +SHA512 (tzcode2024a.tar.gz) = 46da8bfa762c7d109db93e5c060789097fc0e1e38bdad5bb8fec886ef47f138bd03b913a743cd5f7e23dc359a72bfd63e7ffc0de199d2b51e6a174361dbdc43c +SHA512 (tzdata2024a.tar.gz) = 1f09f1b2327cc9e1afc7e9045e83ee3377918dafe1bee2f282b6991828d03b3c70a4d3a17f9207dfb1361bb25bc214a8922a756e84fa114e9ba476226db57236 diff --git a/tzdata.spec b/tzdata.spec index ee6b537..0265b34 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2023d -%define tzdata_version 2023d -%define tzcode_version 2023d +Version: 2024a +%define tzdata_version 2024a +%define tzcode_version 2024a Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,12 @@ 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 From 315da87a470eb048298824a69072d679998c112d Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Tue, 6 Feb 2024 13:15:51 -0500 Subject: [PATCH 3/3] Resolves: #2262312 - Correct the bz# for the tzdata-2024 commit. --- tzdata.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tzdata.spec b/tzdata.spec index 0265b34..c36efdc 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2024a %define tzdata_version 2024a %define tzcode_version 2024a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz @@ -151,6 +151,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Feb 06 2024 Patsy Griffin - 2024a-2 +- Correct the bz# for the tzdata-2024 commit. + * 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.