From ecc96fef061ac09c17cb5b5897a56e6051c6197e Mon Sep 17 00:00:00 2001 From: kth5 Date: Sun, 9 Feb 2025 11:10:16 +0100 Subject: [PATCH] * update tzdata to 2025a-1 --- tzdata/.SRCINFO | 19 +++++++++---------- tzdata/0001-Apr-not-April.patch | 25 ------------------------- tzdata/PKGBUILD | 22 ++++++++-------------- 3 files changed, 17 insertions(+), 49 deletions(-) delete mode 100644 tzdata/0001-Apr-not-April.patch diff --git a/tzdata/.SRCINFO b/tzdata/.SRCINFO index c9e849066b..8246c7b26e 100644 --- a/tzdata/.SRCINFO +++ b/tzdata/.SRCINFO @@ -1,27 +1,26 @@ pkgbase = tzdata pkgdesc = Sources for time zone and daylight saving time data - pkgver = 2024b - pkgrel = 2 + pkgver = 2025a + pkgrel = 1 url = https://www.iana.org/time-zones arch = x86_64 arch = powerpc64le arch = powerpc64 arch = powerpc + arch = espresso arch = riscv64 license = LicenseRef-tz optdepends = bash: for tzselect optdepends = glibc: for zdump, zic options = !emptydirs - source = https://www.iana.org/time-zones/repository/releases/tzcode2024b.tar.gz - source = https://www.iana.org/time-zones/repository/releases/tzcode2024b.tar.gz.asc - source = https://www.iana.org/time-zones/repository/releases/tzdata2024b.tar.gz - source = https://www.iana.org/time-zones/repository/releases/tzdata2024b.tar.gz.asc - source = 0001-Apr-not-April.patch + source = https://www.iana.org/time-zones/repository/releases/tzcode2025a.tar.gz + source = https://www.iana.org/time-zones/repository/releases/tzcode2025a.tar.gz.asc + source = https://www.iana.org/time-zones/repository/releases/tzdata2025a.tar.gz + source = https://www.iana.org/time-zones/repository/releases/tzdata2025a.tar.gz.asc validpgpkeys = 7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34 - sha512sums = 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026 + sha512sums = 308f6a3d6ebfa18446f8296e5c799e18dccecd79ace3ba004d3f233892c7428faae152b217b22d229c59dd4e0faafee797d8b3583b58fa982b81f7cc7347f502 sha512sums = SKIP - sha512sums = 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193 + sha512sums = 93b8f939d39bdfe451e262666f9099c529c96c49d14c08e3611560ca660e12e16d08a22b145d615e00570fb194881618d6f9a0a617c119ab447be03279d747c3 sha512sums = SKIP - sha512sums = 19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf pkgname = tzdata diff --git a/tzdata/0001-Apr-not-April.patch b/tzdata/0001-Apr-not-April.patch deleted file mode 100644 index 6b5af0b6f9..0000000000 --- a/tzdata/0001-Apr-not-April.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Thu, 5 Sep 2024 14:36:02 -0700 -Subject: [PATCH] "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. ---- - northamerica | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -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/tzdata/PKGBUILD b/tzdata/PKGBUILD index 1ae871f743..02d28d5df1 100644 --- a/tzdata/PKGBUILD +++ b/tzdata/PKGBUILD @@ -2,10 +2,10 @@ # Maintainer: Andreas Radke pkgname=tzdata -pkgver=2024b -_tzcode=2024b -_tzdata=2024b -pkgrel=2.1 +pkgver=2025a +_tzcode=2025a +_tzdata=2025a +pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" arch=(x86_64 powerpc64le powerpc64 powerpc espresso riscv64) url="https://www.iana.org/time-zones" @@ -14,13 +14,11 @@ optdepends=('bash: for tzselect' 'glibc: for zdump, zic') options=('!emptydirs') source=(https://www.iana.org/time-zones/repository/releases/tzcode${_tzcode}.tar.gz{,.asc} - https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc} - 0001-Apr-not-April.patch) -sha512sums=('0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026' + https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc}) +sha512sums=('308f6a3d6ebfa18446f8296e5c799e18dccecd79ace3ba004d3f233892c7428faae152b217b22d229c59dd4e0faafee797d8b3583b58fa982b81f7cc7347f502' 'SKIP' - '0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193' - 'SKIP' - '19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf') + '93b8f939d39bdfe451e262666f9099c529c96c49d14c08e3611560ca660e12e16d08a22b145d615e00570fb194881618d6f9a0a617c119ab447be03279d747c3' + 'SKIP') validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') # Paul Eggert _timezones=('africa' 'antarctica' 'asia' 'australasia' @@ -28,10 +26,6 @@ _timezones=('africa' 'antarctica' 'asia' 'australasia' 'etcetera' 'backward' 'factory') prepare() { - pwd - # Use "Apr", not "April", in the IN column - patch -Np1 -i ${srcdir}/0001-Apr-not-April.patch - sed -i "s:sbin:bin:g" Makefile }