Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=866470d1f76e30b96748bbe1cff17535c2d8a5d3
commit 866470d1f76e30b96748bbe1cff17535c2d8a5d3 Author: crazy <[email protected]> Date: Mon Nov 23 21:22:42 2015 +0100 tzdata-2015g-1-x86_64 * Version bump * just use *data* and nothing else * we use the tzcode from glibc now diff --git a/source/base/tzdata/FrugalBuild b/source/base/tzdata/FrugalBuild index ee8b2fb..1ecb1eb 100644 --- a/source/base/tzdata/FrugalBuild +++ b/source/base/tzdata/FrugalBuild @@ -2,9 +2,8 @@ # Maintainer: James Buren <[email protected]> pkgname=tzdata -pkgver=2012j -vertzcode=2012j -pkgrel=2 +pkgver=2015g +pkgrel=1 pkgdesc="Sources for time zone and daylight saving time data" url="http://www.iana.org/time-zones"; # Uses glibc, but do not depend on it. glibc does already. @@ -14,17 +13,34 @@ archs=('i686' 'x86_64' 'arm') Fpkgversep="" up2date="Flasttar $url" _F_cd_path=. -source=($url/repository/releases/${pkgname}$pkgver.tar.gz \ - $url/repository/releases/tzcode${vertzcode}.tar.gz \ - Makefile.patch) -sha1sums=('69a5c9866612792b010f521c0f7b9a34c4e57192' \ - '524808d703aa0fe54cdb19dbafb75c48028e72ad' \ - '1bea8a04b774b52aba33ea718ff7618727eb5802') +source=($url/repository/releases/${pkgname}${pkgver}.tar.gz) +sha1sums=('96528dcbb790ed181a47db7e4cace4eeaec5728e') +options=('nostrip' 'nodocs') build() { - Fbuild - Frm usr/share/zoneinfo/localtime + DIR="$Fdestdir/usr/share/zoneinfo" + tz=('africa' 'antarctica' 'asia' 'australasia' 'europe' 'northamerica' 'southamerica' \ + 'pacificnew' 'etcetera' 'backward' 'systemv' 'factory') + + ## not sure why zone1970.tab is still needed but .. + tab=('iso3166.tab' 'zone1970.tab' 'zone.tab') + + for i in "${tz[@]}" + do + /usr/sbin/zic -y ./yearistype -d ${DIR} ${i} + /usr/sbin/zic -y ./yearistype -d ${DIR}/right -L leapseconds ${i} + /usr/sbin/zic -y ./yearistype -d ${DIR}/posix ${i} + done + + for d in "${tab[@]}" + do + Ffile ${d} /usr/share/zoneinfo/${d} + done + + ## posixrules , localtime + /usr/sbin/zic -y ./yearistype -d ${DIR} -l GMT -p America/New_York + } # optimization OK diff --git a/source/base/tzdata/Makefile.patch b/source/base/tzdata/Makefile.patch deleted file mode 100644 index c3456fb..0000000 --- a/source/base/tzdata/Makefile.patch +++ /dev/null @@ -1,122 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2012-11-12 20:34:49.000000000 -0600 -+++ b/Makefile 2012-12-11 17:46:19.530033250 -0600 -@@ -42,17 +42,17 @@ - - # Everything gets put in subdirectories of. . . - --TOPDIR= /usr/local -+TOPDIR= $(DESTDIR)/usr - - # "Compiled" time zone information is placed in the "TZDIR" directory - # (and subdirectories). - # Use an absolute path name for TZDIR unless you're just testing the software. - --TZDIR= $(TOPDIR)/etc/zoneinfo -+TZDIR= $(TOPDIR)/share/zoneinfo - - # The "tzselect", "zic", and "zdump" commands get installed in. . . - --ETCDIR= $(TOPDIR)/etc -+SBINDIR= $(TOPDIR)/sbin - - # If you "make INSTALL", the "date" command gets installed in. . . - -@@ -60,7 +60,7 @@ - - # Manual pages go in subdirectories of. . . - --MANDIR= $(TOPDIR)/man -+MANDIR= $(TOPDIR)/share/man - - # Library functions are put in an archive in LIBDIR. - -@@ -91,7 +91,7 @@ - - # Non-default libraries needed to link. - # Add -lintl if you want to use `gettext' on Solaris. --LDLIBS= -+LDLIBS=$(LDFLAGS) - - # Add the following to the end of the "CFLAGS=" line as needed. - # -DHAVE_ADJTIME=0 if `adjtime' does not exist (SVR0?) -@@ -225,7 +225,7 @@ - # before the first Monday in January when a "%V" format is used and January 1 - # falls on a Friday, Saturday, or Sunday. - --CFLAGS= -+CFLAGS += -std=gnu99 - - # Linker flags. Default to $(LFLAGS) for backwards compatibility - # to tzcode2012h and earlier. -@@ -274,8 +274,10 @@ - - ############################################################################### - --cc= cc --CC= $(cc) -DTZDIR=\"$(TZDIR)\" -+CC+= -DTZDIR=\"$(TZDIR)\" -+ifeq ($(NLS),1) -+CC += -DHAVE_GETTEXT=1 -DTZ_DOMAIN=\"libc\" -+endif - - TZCSRCS= zic.c localtime.c asctime.c scheck.c ialloc.c - TZCOBJS= zic.o localtime.o asctime.o scheck.o ialloc.o -@@ -316,14 +318,16 @@ - - ALL: all date - --install: all $(DATA) $(REDO) $(TZLIB) $(MANS) $(TABDATA) -+install: all $(DATA) $(REDO) $(MANS) $(TABDATA) - $(ZIC) -y $(YEARISTYPE) \ - -d $(TZDIR) -l $(LOCALTIME) -p $(POSIXRULES) - -rm -f $(TZDIR)/iso3166.tab $(TZDIR)/zone.tab - cp iso3166.tab zone.tab $(TZDIR)/. -- -mkdir $(TOPDIR) $(ETCDIR) -- cp tzselect zic zdump $(ETCDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) \ -+ -mkdir -p $(TOPDIR) $(SBINDIR) -+ cp zic zdump $(SBINDIR)/. -+ -mkdir -p $(TOPDIR) $(BINDIR) -+ cp tzselect $(BINDIR)/. -+ -mkdir -p $(TOPDIR) $(MANDIR) \ - $(MANDIR)/man3 $(MANDIR)/man5 $(MANDIR)/man8 - -rm -f $(MANDIR)/man3/newctime.3 \ - $(MANDIR)/man3/newtzset.3 \ -@@ -332,13 +336,11 @@ - $(MANDIR)/man8/zdump.8 \ - $(MANDIR)/man8/zic.8 - cp newctime.3 newtzset.3 $(MANDIR)/man3/. -- cp tzfile.5 $(MANDIR)/man5/. -- cp tzselect.8 zdump.8 zic.8 $(MANDIR)/man8/. - - INSTALL: ALL install date.1 -- -mkdir $(TOPDIR) $(BINDIR) -+ -mkdir -p $(TOPDIR) $(BINDIR) - cp date $(BINDIR)/. -- -mkdir $(TOPDIR) $(MANDIR) $(MANDIR)/man1 -+ -mkdir -p $(TOPDIR) $(MANDIR) $(MANDIR)/man1 - -rm -f $(MANDIR)/man1/date.1 - cp date.1 $(MANDIR)/man1/. - -@@ -372,9 +374,9 @@ - # You must replace all of $(TZDIR) to switch from not using leap seconds - # to using them, or vice versa. - other_two: zic leapseconds $(TDATA) -- $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)-posix -L /dev/null $(TDATA) -+ $(ZIC) -y $(YEARISTYPE) -d $(TZDIR)/posix -L /dev/null $(TDATA) - $(ZIC) -y $(YEARISTYPE) \ -- -d $(TZDIR)-leaps -L leapseconds $(TDATA) -+ -d $(TZDIR)/right -L leapseconds $(TDATA) - - posix_right: posix_only other_two - -@@ -401,7 +403,7 @@ - <$? >$@ - chmod +x $@ - --check: check_tables check_web -+check: check_tables - - check_tables: checktab.awk $(PRIMARY_YDATA) - $(AWK) -f checktab.awk $(PRIMARY_YDATA) _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
