[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 771aef5d309a3539ceb8112c26a9fbafb91a01af

[git.ipfire.org] IPFire 3.x development tree branch, master, updated. 771aef5d309a3539ceb8112c26a9fbafb91a01af

[git]

[-- Attachment #1: Type: text/plain, Size: 3003 bytes --]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".

The branch, master has been updated
       via  771aef5d309a3539ceb8112c26a9fbafb91a01af (commit)
      from  c98024d1a7eb7ed566834de56b1e5c06fd47ed93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 771aef5d309a3539ceb8112c26a9fbafb91a01af
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date:   Sun Nov 23 01:34:07 2014 +0100

    tzdata: Update to 2014j

-----------------------------------------------------------------------

Summary of changes:
 tzdata/tzdata.nm | 43 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 9 deletions(-)

Difference in files:
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index a758b5c..434fb68 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
 ###############################################################################
 
-tzdata_version = 2013b
-tzcode_version = 2013b
+tzdata_version = 2014j
+tzcode_version = 2014j
 
 name       = tzdata
 version    = %{tzdata_version}
@@ -33,15 +33,40 @@ build
 	DIR_APP = %{DIR_SRC}/tzdata%{tzdata_version}
 
 	prepare
-		mkdir tzdata%{tzdata_version}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C tzdata%{tzdata_version}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzdata%{tzdata_version}.tar.gz -C tzdata%{tzdata_version}
+		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
+
+	build
+		mkdir -pv zoneinfo/{,posix,right}
+
+		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
+
 	install
-		make TOPDIR=%{BUILDROOT}/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
-			TZDIR=%{BUILDROOT}/usr/share/zoneinfo install
-		mv %{BUILDROOT}/usr/share/zoneinfo-posix/ %{BUILDROOT}/usr/share/posix
-		mv %{BUILDROOT}/usr/share/zoneinfo-leaps/ %{BUILDROOT}/usr/share/right
+		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


hooks/post-receive
--
IPFire 3.x development tree