X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Ftzdata;h=7d13c9596993651bd1df62fe8db91e9016eb9dad;hp=edf5ff22dea4ed7565ac9a52902862f85f3bfaf7;hb=8b48e20bb3ecf9f4c56d040f9e91fccb5e859313;hpb=0d3e1e8c1da5b0ae9e56ac320be02bdb043485d4

diff --git a/lfs/tzdata b/lfs/tzdata
index edf5ff22de..7d13c95969 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -24,15 +24,18 @@
 
 include Config
 
-VER        = 2012h
-TZDATA_VER = 2012h
-TZCODE_VER = 2012h
+VER        = 2014j
+TZDATA_VER = $(VER)
+TZCODE_VER = $(VER)
 
 THISAPP    = tzdata-$(VER)
 DL_FROM    = $(URL_IPFIRE)
 DIR_APP    = $(DIR_SRC)/$(THISAPP)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
+FILES      = africa antarctica asia australasia europe \
+	northamerica southamerica pacificnew etcetera backward
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -42,8 +45,8 @@ objects = tzdata$(TZDATA_VER).tar.gz tzcode$(TZCODE_VER).tar.gz
 tzdata$(TZDATA_VER).tar.gz = $(DL_FROM)/tzdata$(TZDATA_VER).tar.gz
 tzcode$(TZCODE_VER).tar.gz = $(DL_FROM)/tzcode$(TZCODE_VER).tar.gz
 
-tzdata$(TZDATA_VER).tar.gz_MD5 = b937335e087fb85b7f8e3ce33e69184b
-tzcode$(TZCODE_VER).tar.gz_MD5 = 44b3b6c3e50240ac44f16437040a7ba2
+tzdata$(TZDATA_VER).tar.gz_MD5 = 2d7ea9c309f0d4e162e426e568290ca3
+tzcode$(TZCODE_VER).tar.gz_MD5 = 970119e9765bc5a9320368851c91ecb6
 
 install : $(TARGET)
 
@@ -77,16 +80,22 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	tar axf $(DIR_DL)/tzdata$(TZDATA_VER).tar.gz -C $(DIR_APP)
 	tar axf $(DIR_DL)/tzcode$(TZCODE_VER).tar.gz -C $(DIR_APP)
 
-	cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
-		TZDIR=/usr/share/zoneinfo all
-	cd $(DIR_APP) && make TOPDIR=/usr ETCDIR=/tmp LIBDIR=/tmp MANDIR=/tmp \
-		TZDIR=/usr/share/zoneinfo install
+	cd $(DIR_APP) && mkdir -pv zoneinfo/{,posix,right}
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo \
+		-L /dev/null -p GMT $(FILES)
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/posix \
+		-L /dev/null $(FILES)
+	cd $(DIR_APP) && zic -y ./yearistype -d zoneinfo/right \
+		-L /dev/null $(FILES)
 
-	-mkdir -pv /usr/share/zoneinfo
-	mv -v /usr/share/zoneinfo-posix /usr/share/zoneinfo/posix
-	mv -v /usr/share/zoneinfo-leaps /usr/share/zoneinfo/right
-	rm -vf /usr/share/zoneinfo/localtime
+	rm -rf /usr/share/zoneinfo
+	cd $(DIR_APP) && cp -prd zoneinfo /usr/share
+	cd $(DIR_APP) && install -p -m 644 zone.tab iso3166.tab \
+		/usr/share/zoneinfo
 
+	rm -vf /usr/share/zoneinfo/localtime
+	rm -vf /etc/localtime
 	cp -vf /usr/share/zoneinfo/GMT /etc/localtime
+
 	@rm -rf $(DIR_APP)
 	@$(POSTBUILD)