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

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

[git]

[-- Attachment #1: Type: text/plain, Size: 3296 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  db15e530757260c5483059544fc95599d2743c4e (commit)
      from  7b81d850cffd6e8c894c3b4874e6a04844c804ab (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 db15e530757260c5483059544fc95599d2743c4e
Author: Thomas Ebert <thomas.ebert(a)ipfire.org>
Date:   Tue Mar 26 17:07:48 2013 +0100

    tzdata: Updated to recent version 2013b
    
    Fix bug 10337.

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

Summary of changes:
 tzdata/tzdata.nm | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

Difference in files:
diff --git a/tzdata/tzdata.nm b/tzdata/tzdata.nm
index 79ef3ed..a758b5c 100644
--- a/tzdata/tzdata.nm
+++ b/tzdata/tzdata.nm
@@ -3,8 +3,8 @@
 # Copyright (C) - IPFire Development Team <info(a)ipfire.org>                   #
 ###############################################################################
 
-tzdata_version = 2011n
-tzcode_version = 2011i
+tzdata_version = 2013b
+tzcode_version = 2013b
 
 name       = tzdata
 version    = %{tzdata_version}
@@ -12,7 +12,7 @@ release    = 1
 arch       = noarch
 
 groups     = System/Base
-url        = ftp://munnari.oz.au/pub/
+url        = http://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 += http://www.iana.org/time-zones/repository/releases/
+sources    = tzdata%{tzdata_version}.tar.gz tzcode%{tzcode_version}.tar.gz
 
 build
 	requires
@@ -30,25 +30,20 @@ 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 tzdata%{tzdata_version} tzcode%{tzcode_version}
+		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}
-		%{MACRO_EXTRACT} %{DIR_DL}/tzcode%{tzcode_version}.tar.gz -C tzcode%{tzcode_version}
-
-		sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-			-e 's|@datadir@|/usr/share|' \
-			-e 's|@install_root@|%{BUILDROOT}|' \
-			Makeconfig.in > Makeconfig
 	end
-
-	#test
-	#	make check
-	#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
+		rm -f %{BUILDROOT}/usr/share/zoneinfo/localtime
+	end
 end
 
 packages


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