X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=tzdata%2Ftzdata.nm;h=b05a04a6dfebb1cded0d65163d239d1a324de21e;hb=515b7d8646c1ad5ef2807a4c4e08453cd82665fc;hp=79ef3ed81a9cba2b9e24f130fbb8a5039e13ae4b;hpb=203539d956d7d38568a3fd130941d1ef3aeef3f1;p=ipfire-3.x.git

diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 79ef3ed81..b05a04a6d 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
 # Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
 ###############################################################################
 
-tzdata_version = 2011n
-tzcode_version = 2011i
+tzdata_version = 2019a
+tzcode_version = 2019a
 
 name       = tzdata
 version    = %{tzdata_version}
@@ -12,7 +12,7 @@ release    = 1
 arch       = noarch
 
 groups     = System/Base
-url        = ftp://munnari.oz.au/pub/
+url        = https://www.iana.org/time-zones
 license    = Public Domain
 summary    = Timezone data.
 
@@ -21,8 +21,8 @@ description
 	the world.
 end
 
-source_dl += ftp://elsie.nci.nih.gov/pub/
-sources    = tzdata-base-0.tar.bz2 tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
+source_dl += https://www.iana.org/time-zones/repository/releases/
+sources    = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
 
 build
 	requires
@@ -30,25 +30,45 @@ build
 		perl
 	end
 
-	DIR_APP = %{DIR_SRC}/tzdata
+	DIR_APP = %{DIR_SRC}/tzdata%{tzdata_version}
 
 	prepare
-		%{MACRO_EXTRACT} %{DIR_DL}/tzdata-base-0.tar.bz2
-		cd %{DIR_APP}
+		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
+
+	files = \
+		africa \
+		antarctica \
+		asia \
+		australasia \
+		europe \
+		northamerica \
+		southamerica \
+		pacificnew \
+		etcetera \
+		backward
 
-		mkdir tzdata%{tzdata_version} tzcode%{tzcode_version}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzdata%{tzdata_version}.tar.gz -C tzdata%{tzdata_version}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C tzcode%{tzcode_version}
+	build
+		mkdir -pv zoneinfo/{,posix,right}
 
-		sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-			-e 's|@datadir@|/usr/share|' \
-			-e 's|@install_root@|%{BUILDROOT}|' \
-			Makeconfig.in > Makeconfig
+		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
 
-	#test
-	#	make check
-	#end
+	install
+		mkdir -pv %{BUILDROOT}%{datadir}/zoneinfo
+		cp -prd zoneinfo/* %{BUILDROOT}%{datadir}/zoneinfo
+
+		install -p -m 644 zone.tab iso3166.tab \
+			%{BUILDROOT}%{datadir}/zoneinfo
+		rm -f %{BUILDROOT}/usr/share/zoneinfo/localtime
+	end
 end
 
 packages