Andreas Radke pushed to branch main at Arch Linux / Packaging / Packages / tzdata
Commits: 259ad2a4 by Andreas Radke at 2024-09-10T15:52:37+02:00 upgpkg: 2024b-2; fix "Apr" not detected in Northamerica (https://github.com/HowardHinnant/date/issues/836) - - - - - 3 changed files: - .SRCINFO - + 0001-Apr-not-April.patch - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = tzdata pkgdesc = Sources for time zone and daylight saving time data pkgver = 2024b - pkgrel = 1 + pkgrel = 2 url = https://www.iana.org/time-zones arch = x86_64 license = LicenseRef-tz @@ -12,10 +12,12 @@ pkgbase = tzdata 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 validpgpkeys = 7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34 sha512sums = 0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026 sha512sums = SKIP sha512sums = 0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193 sha512sums = SKIP + sha512sums = 19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf pkgname = tzdata ===================================== 0001-Apr-not-April.patch ===================================== @@ -0,0 +1,25 @@ +From 926b507fa5c3192b1b68fab5910cbd3ba9377c97 Mon Sep 17 00:00:00 2001 +From: Paul Eggert <[email protected]> +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 ===================================== PKGBUILD ===================================== @@ -4,7 +4,7 @@ pkgname=tzdata pkgver=2024b _tzcode=2024b _tzdata=2024b -pkgrel=1 +pkgrel=2 pkgdesc="Sources for time zone and daylight saving time data" arch=('x86_64') url="https://www.iana.org/time-zones"; @@ -13,11 +13,13 @@ 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}) + https://www.iana.org/time-zones/repository/releases/${pkgname}${_tzdata}.tar.gz{,.asc} + 0001-Apr-not-April.patch) sha512sums=('0e4e872d6c6d9e2ce8c4e567fcbb7658942b8544157d1e48673d9cb989f3af3379fa58e7a71ab98f4a8f2ac6727de1f8c4cd1981053409ebd8989345dc640026' 'SKIP' '0d86686e215672343debb3471b7e7ccb8a27f063f085c9b532d5e0470377843daa0dfb6aee0db4fb9068dd52810c69aeee914a1a7c7e603fdecda7e855020193' - 'SKIP') + 'SKIP' + '19b546392fd0c8c6c2c535ca4e0d83baeef2741ee93cf58d9d8dc4f06d30e69bb47883652d2b3e23838f41d0a8600dbcfb2286bb11d107fb3f4a98920ca9bbcf') validpgpkeys=('7E3792A9D8ACF7D633BC1588ED97E90E62AA7E34') # Paul Eggert <[email protected]> _timezones=('africa' 'antarctica' 'asia' 'australasia' @@ -25,6 +27,10 @@ _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 } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/tzdata/-/commit/259ad2a45b5121a9c94f53e1a380790af9a8d046 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/tzdata/-/commit/259ad2a45b5121a9c94f53e1a380790af9a8d046 You're receiving this email because of your account on gitlab.archlinux.org.
