From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 21 Dec 2022 10:54:22 +0000 (+0000)
Subject: tzdata: Update to 2022g
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=90d873348e4f18f83b809d1dfd1b2b7b355311b3;p=ipfire-3.x.git

tzdata: Update to 2022g

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index ece9f66ef..3219b8c3c 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,26 +3,27 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-tzdata_version = 2019b
-tzcode_version = 2019b
+tzdata_version = 2022g
+tzcode_version = 2022g
 
 name       = tzdata
 version    = %{tzdata_version}
 release    = 1
 arch       = noarch
+thisapp    = tzdb-%{version}
 
 groups     = System/Base
 url        = https://www.iana.org/time-zones
 license    = Public Domain
-summary    = Timezone data.
+summary    = Timezone data
 
 description
 	This package contains data files with rules for various timezones around
 	the world.
 end
 
-source_dl += https://www.iana.org/time-zones/repository/releases/
-sources    = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
+source_dl  = https://www.iana.org/time-zones/repository/releases/
+sources    = %{thisapp}.tar.lz
 
 build
 	requires
@@ -30,15 +31,13 @@ build
 		perl
 	end
 
-	DIR_APP = %{DIR_SRC}/tzdata%{tzdata_version}
+	make_build_targets += \
+		CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
 
-	prepare
-		mkdir -pv %{DIR_APP}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C %{DIR_APP}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzdata%{tzdata_version}.tar.gz -C %{DIR_APP}
-	end
+	make_install_targets += \
+		BINDIR=%{bindir} LIBDIR=%{libdir} MANDIR=%{mandir}
 
-	files = \
+	timezones = \
 		africa \
 		antarctica \
 		asia \
@@ -46,31 +45,31 @@ build
 		europe \
 		northamerica \
 		southamerica \
-		pacificnew \
 		etcetera \
-		backward
+		backward \
+		factory
 
-	build
-		mkdir -pv zoneinfo/{,posix,right}
+	install_cmds
+		./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" %{timezones}
+		./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/posix" %{timezones}
+		./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo/right" -L leapseconds %{timezones}
 
-		zic -y ./yearistype -d zoneinfo \
-			-L /dev/null -p GMT %{files}
-		zic -y ./yearistype -d zoneinfo/posix \
-			-L /dev/null %{files}
-		zic -y ./yearistype -d zoneinfo/right \
-			-L leapseconds %{files}
-	end
+		# This creates the posixrules file.
+		# We use New York because POSIX requires the daylight savings time rules to be
+		# in accordance with US rules.
+		./zic -b fat -d "%{BUILDROOT}%{datadir}/zoneinfo" -p America/New_York
 
-	install
-		mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
-		cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
+		install -v -m 644 iso3166.tab leap-seconds.list zone1970.tab zone.tab SECURITY \
+			"%{BUILDROOT}%{datadir}/zoneinfo"
 
-		install -p -m 644 zone.tab iso3166.tab \
-			%{BUILDROOT}%{datadir}/zoneinfo
-		rm -f %{BUILDROOT}/usr/share/zoneinfo/localtime
+		rm -vf "%{BUILDROOT}%{sysconfdir}/localtime"
 	end
 end
 
 packages
 	package %{name}
+
+	package %{name}-debuginfo
+		template DEBUGINFO
+	end
 end