rpms/tzdata
7
0
Fork 0
Code Issues Pull Requests Releases Activity

BUmped source/target to build with jdk11

Browse Source
This commit is contained in:
Jiri 2020-06-12 08:18:47 +02:00
parent 582b815ba5
commit 6f42f9312b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tzdata.spec
View File

@ -3,7 +3,7 @@ Name: tzdata
Version: 2020a Version: 2020a
%define tzdata_version 2020a %define tzdata_version 2020a
%define tzcode_version 2020a %define tzcode_version 2020a
Release: 1%{?dist} Release: 2%{?dist}
License: Public Domain License: Public Domain
URL: https://www.iana.org/time-zones URL: https://www.iana.org/time-zones
Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz
@ -95,7 +95,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
# Java 6/7 tzdata # Java 6/7 tzdata
pushd javazic pushd javazic
javac -source 1.5 -target 1.5 -classpath . `find . -name \*.java` javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java`
popd popd
java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
@ -104,7 +104,7 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \
# Java 8 tzdata # Java 8 tzdata
pushd javazic-1.8 pushd javazic-1.8
javac -source 1.7 -target 1.7 -classpath . `find . -name \*.java` javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java`
popd popd
java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \
@ -134,6 +134,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
%{_datadir}/javazi-1.8 %{_datadir}/javazi-1.8
%changelog %changelog
* Fri Jun 12 2020 Jiri Vanek <jvanek@redhat.com> - 2020a-2
- bumped source/target to 1.6 for tzdata for jdk6/7
- bumped source/target to 1.8 for tzdata for jdk8
* Thu Apr 30 2020 Patsy Griffin <patsy@redhat.com> - 2020a-1 * Thu Apr 30 2020 Patsy Griffin <patsy@redhat.com> - 2020a-1
- Rebase to tzdata-2020a - Rebase to tzdata-2020a
- Morocco will spring forward on 2020-05-31 rather than - Morocco will spring forward on 2020-05-31 rather than