|
|
@@ -1,11 +1,9 @@
|
|
|
-%bcond_without java18
|
|
|
-
|
|
|
Summary: Timezone data
|
|
|
Summary(ja): タイムゾーンのデータ
|
|
|
Name: tzdata
|
|
|
-Version: 2017b
|
|
|
-%define tzdata_version 2017b
|
|
|
-%define tzcode_version 2017b
|
|
|
+Version: 2018i
|
|
|
+%define tzdata_version 2018i
|
|
|
+%define tzcode_version 2018i
|
|
|
Release: 1%{?_dist_release}
|
|
|
|
|
|
License: Public Domain
|
|
|
@@ -21,6 +19,8 @@ Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz
|
|
|
Source2: javazic.tar.gz
|
|
|
Source3: javazic-1.8-37392f2f5d59.tar.xz
|
|
|
|
|
|
+Patch002: 0002-Fix-have-snprintf-error.patch
|
|
|
+
|
|
|
Patch100: javazic-fixup.patch
|
|
|
Patch101: rebase-01.patch
|
|
|
Patch102: rebase-02.patch
|
|
|
@@ -53,6 +53,17 @@ This package contains timezone information for use by Java runtimes.
|
|
|
%prep
|
|
|
%setup -q -c -a 1
|
|
|
|
|
|
+%patch002 -p1
|
|
|
+
|
|
|
+# tzdata-2018g introduce 25:00 transition times. This breaks OpenJDK.
|
|
|
+# Use rearguard for tzdata-2018g java
|
|
|
+mkdir rearguard
|
|
|
+make VERSION=%{version} tzdata%{version}-rearguard.tar.gz
|
|
|
+mv tzdata%{version}-rearguard.tar.gz rearguard
|
|
|
+pushd rearguard
|
|
|
+tar zxf tzdata%{version}-rearguard.tar.gz
|
|
|
+popd
|
|
|
+
|
|
|
mkdir javazic
|
|
|
tar zxf %{SOURCE2} -C javazic
|
|
|
pushd javazic
|
|
|
@@ -80,6 +91,9 @@ echo "%{name}%{tzdata_version}" >> VERSION
|
|
|
|
|
|
|
|
|
%build
|
|
|
+# Run make to create the tzdata.zi file
|
|
|
+make tzdata.zi
|
|
|
+
|
|
|
FILES="africa antarctica asia australasia europe northamerica southamerica
|
|
|
pacificnew etcetera backward"
|
|
|
|
|
|
@@ -88,7 +102,11 @@ 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
|
|
|
+# tzdata-2018g uses 25:00 which breaks java - use the rearguard files for java
|
|
|
+JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
|
|
|
+ rearguard/australasia rearguard/europe rearguard/northamerica \
|
|
|
+ rearguard/southamerica rearguard/pacificnew rearguard/etcetera \
|
|
|
+ rearguard/backward"
|
|
|
|
|
|
# Java 6/7 tzdata
|
|
|
pushd javazic
|
|
|
@@ -97,9 +115,8 @@ popd
|
|
|
|
|
|
java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
|
|
|
-d javazi \
|
|
|
- $FILES javazic/tzdata_jdk/gmt javazic/tzdata_jdk/jdk11_backward
|
|
|
+ $JAVA_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`
|
|
|
@@ -108,21 +125,17 @@ 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
|
|
|
+ $JAVA_FILES javazic-1.8/tzdata_jdk/gmt javazic-1.8/tzdata_jdk/jdk11_backward
|
|
|
|
|
|
|
|
|
%install
|
|
|
rm -fr $RPM_BUILD_ROOT
|
|
|
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
|
|
|
+install -p -m 644 zone.tab zone1970.tab iso3166.tab leapseconds tzdata.zi $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
|
|
|
@@ -130,18 +143,21 @@ rm -fr $RPM_BUILD_ROOT
|
|
|
%files
|
|
|
%defattr(-,root,root)
|
|
|
%{_datadir}/zoneinfo
|
|
|
+%license LICENSE
|
|
|
%doc README
|
|
|
-%doc Theory
|
|
|
+%doc theory.html
|
|
|
%doc tz-link.html
|
|
|
+%doc tz-art.html
|
|
|
|
|
|
%files java
|
|
|
%defattr(-,root,root)
|
|
|
%{_datadir}/javazi
|
|
|
-%if %{with java18}
|
|
|
%{_datadir}/javazi-1.8
|
|
|
-%endif
|
|
|
|
|
|
%changelog
|
|
|
+* Sun Jan 06 2019 Tomohiro "Tomo-p" KATO <tomop@teamgedoh.net> 2018i-1
|
|
|
+- updated to 2018i.
|
|
|
+
|
|
|
* Mon Jun 26 2017 IWAI, Masaharu <iwaim.sub@gmail.com> 2017b-1
|
|
|
- update to 2017b
|
|
|
|
tomop