tzdata-2015e-1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9608 ec354946-7b23-47d6-9f5a-488ba84defc7

t/tzdata/tzdata-vl.spec

@@ -1,27 +1,28 @@
+%bcond_with java18
+
 Summary: Timezone data
 Summary(ja): タイムゾーンのデータ
 Name: tzdata
-Version: 2014e
-%define tzdata_version 2014e
-%define tzcode_version 2014e
+Version: 2015e
+%define tzdata_version 2015e
+%define tzcode_version 2015e
 Release: 1%{?_dist_release}
 
 License: Public Domain
 Group: System Environment/Base
-URL: ftp://elsie.nci.nih.gov/pub/
+URL: https://www.iana.org/time-zones
 
-# The tzdata-base-0.tar.bz2 is a simple building infrastructure and
-# a test suite.  It is occasionally updated from glibc sources, and as
-# such is under LGPLv2+, but none of this ever gets to be part of
-# final zoneinfo files.
-Source0: tzdata-base-0.tar.bz2
 # These are official upstream.
-Source1: ftp://munnari.oz.au/pub/tzdata%{tzdata_version}.tar.gz
-Source2: ftp://munnari.oz.au/pub/tzcode%{tzcode_version}.tar.gz
-Source3: javazic.tar.gz
+Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
+Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
+Source2: javazic.tar.gz
+Source3: javazic-1.8-37392f2f5d59.tar.xz
 
 Patch100: javazic-fixup.patch
-Patch101: javazic-exclusion-fix.patch
+Patch101: rebase-01.patch
+Patch102: rebase-02.patch
+Patch103: 7090844.patch
+Patch104: 7133138.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildArch: noarch
@@ -47,27 +48,16 @@ This package contains timezone information for use by Java runtimes.
 
 
 %prep
-%setup -n tzdata
-mkdir tzdata%{tzdata_version}
-tar xzf %{SOURCE1} -C tzdata%{tzdata_version}
-mkdir tzcode%{tzcode_version}
-tar xzf %{SOURCE2} -C tzcode%{tzcode_version}
-sed -e 's|@objpfx@|'`pwd`'/obj/|' \
-    -e 's|@datadir@|%{_datadir}|' \
-  Makeconfig.in > Makeconfig
-
-pushd src
-for i in ../tzcode%{tzcode_version}/*.{c,h,ksh,[1-9]}
-do
-  ln -sf $i .
-done
-popd
+%setup -q -c -a 1
 
 mkdir javazic
-tar zxf %{SOURCE3} -C javazic
+tar zxf %{SOURCE2} -C javazic
 pushd javazic
 %patch100
 %patch101
+%patch102
+%patch103
+%patch104
 
 # Hack alert! sun.tools may be defined and installed in the
 # VM. In order to guarantee that we are using IcedTea/OpenJDK
@@ -81,44 +71,55 @@ find . -type f -name '*.java' -print0 \
                          -e 's:sun\.util\.:rht.util.:g'
 popd
 
+tar xf %{SOURCE3}
+
+echo "%{name}%{tzdata_version}" >> VERSION
+
 
 %build
-make
-grep -v tz-art.htm tzcode%{tzcode_version}/tz-link.htm > tzcode%{tzcode_version}/tz-link.html
+FILES="africa antarctica asia australasia europe northamerica southamerica
+       pacificnew etcetera backward"
+
+mkdir zoneinfo/{,posix,right}
+zic -y ./yearistype -d zoneinfo -L /dev/null -p America/New_York $FILES
+zic -y ./yearistype -d zoneinfo/posix -L /dev/null $FILES
+zic -y ./yearistype -d zoneinfo/right -L leapseconds $FILES
+
+grep -v tz-art.htm tz-link.htm > tz-link.html
 
+# Java 6/7 tzdata
 pushd javazic
 javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java`
 popd
-pushd tzdata%{tzdata_version}
-java -classpath ../javazic/ rht.tools.javazic.Main -V %{version} \
-  -d ../zoneinfo/java \
-  africa antarctica asia australasia europe northamerica pacificnew \
-  southamerica backward etcetera \
-  ../javazic/tzdata_jdk/gmt ../javazic/tzdata_jdk/jdk11_backward
+
+java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
+  -d javazi \
+  $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
+
+%if %{with java18}
+# Java 8 tzdata
+pushd javazic-1.8
+javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java`
 popd
 
+java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
+    -srcdir . -dstfile tzdb.dat \
+    -verbose \
+    $FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
+%endif
+
 
 %install
 rm -fr $RPM_BUILD_ROOT
-sed -i 's|@install_root@|%{buildroot}|' Makeconfig
-make install \
-  TOPDIR=%{buildroot}%{_prefix} \
-  TZDIR=%{buildroot}%{_datadir}/zoneinfo
-
-cp -pr zoneinfo/java $RPM_BUILD_ROOT%{_datadir}/javazi
-
-rm -f %{buildroot}%{_datadir}/zoneinfo-posix
-mkdir %{buildroot}%{_datadir}/zoneinfo-posix
-cp -af %{buildroot}%{_datadir}/zoneinfo/* %{buildroot}%{_datadir}/zoneinfo-posix
-mkdir %{buildroot}%{_datadir}/zoneinfo/posix
-cp -af %{buildroot}%{_datadir}/zoneinfo-posix/* %{buildroot}%{_datadir}/zoneinfo/posix
-mkdir -p %{buildroot}%{_datadir}/zoneinfo/right
-cp -a %{buildroot}%{_datadir}/zoneinfo-leaps/* %{buildroot}%{_datadir}/zoneinfo/right
-
-rm -rf %{buildroot}%{_datadir}/zoneinfo-{posix,leaps}
-rm -rf %{buildroot}%{_prefix}/etc
-rm -rf %{buildroot}%{_prefix}/lib
-rm -rf %{buildroot}%{_prefix}/man
+install -d $RPM_BUILD_ROOT%{_datadir}
+cp -prd zoneinfo $RPM_BUILD_ROOT%{_datadir}
+install -p -m 644 zone.tab iso3166.tab $RPM_BUILD_ROOT%{_datadir}/zoneinfo
+cp -prd javazi $RPM_BUILD_ROOT%{_datadir}/javazi
+
+%if %{with java18}
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/javazi-1.8
+install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
+%endif
 
 %clean
 rm -fr $RPM_BUILD_ROOT
@@ -126,15 +127,21 @@ rm -fr $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root)
 %{_datadir}/zoneinfo
-%doc tzcode%{tzcode_version}/README
-%doc tzcode%{tzcode_version}/Theory
-%doc tzcode%{tzcode_version}/tz-link.html
+%doc README
+%doc Theory
+%doc tz-link.html
 
 %files java
 %defattr(-,root,root)
 %{_datadir}/javazi
+%if %{with java18}
+%{_datadir}/javazi-1.8
+%endif
 
 %changelog
+* Wed Jun 17 2015 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2015e-1
+- updated to 2015e.
+
 * Sun Jun 24 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 2012c-1
 - update to tzdata-2012c, tzcode-2012b
 
@@ -255,7 +262,7 @@ rm -fr $RPM_BUILD_ROOT
 * Thu Mar 16 2006 Petr Machata <pmachata@redhat.com> - 2006b-2
 - Patch for Sri Lanka time zone change (#184514)
 
-* Thu Feb 22 2006 Petr Machata <pmachata@redhat.com> 2006b-1
+* Wed Feb 22 2006 Petr Machata <pmachata@redhat.com> 2006b-1
 - Upstream 2006b:
   - using tz64code version, as 32 is legacy according to tzdata ML
   - new manual pages for ctime, strftime, tzset