Skip to content

Commit

Permalink
tzdata: fix Apr not detected in NorthAmerica (thx arch), relbump
Browse files Browse the repository at this point in the history
  • Loading branch information
sighook committed Sep 14, 2024
1 parent ff7815c commit f3cd650
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 4 deletions.
1 change: 1 addition & 0 deletions tzdata/.md5sum
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
f9eb0273d9696455c40cba195c6db1d7 0001-Apr-not-April.patch
96e374a9ef691aaba355cd726c906a1f tzdb-2024b.tar.lz
25 changes: 25 additions & 0 deletions tzdata/0001-Apr-not-April.patch
Original file line number Diff line number Diff line change
@@ -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
11 changes: 7 additions & 4 deletions tzdata/Pkgfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,22 @@

name=tzdata
version=2024b
release=1
source=https://data.iana.org/time-zones/releases/tzdb-$version.tar.lz
release=2
source="https://data.iana.org/time-zones/releases/tzdb-$version.tar.lz
0001-Apr-not-April.patch"

build() {
cd tzdb-$version

# https://github.com/HowardHinnant/date/issues/836
patch -p1 -i $SRC/0001-Apr-not-April.patch

make V=1 CFLAGS="$CFLAGS"
make DESTDIR=$PKG install

# provided by man-pages package
rm -r $PKG/usr/share/man/man5 $PKG/usr/share/man/man8

# conflicts with glibc package
rm $PKG/etc/localtime
rmdir $PKG/etc
rm $PKG/etc/localtime && rmdir $PKG/etc
}

0 comments on commit f3cd650

Please sign in to comment.