From 6f42f9312b6ada5ae84603e54a721cc6916eba80 Mon Sep 17 00:00:00 2001 From: Jiri Date: Fri, 12 Jun 2020 08:18:47 +0200 Subject: [PATCH] BUmped source/target to build with jdk11 --- tzdata.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 683fe92..4b2b7bf 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -3,7 +3,7 @@ Name: tzdata Version: 2020a %define tzdata_version 2020a %define tzcode_version 2020a -Release: 1%{?dist} +Release: 2%{?dist} License: Public Domain URL: https://www.iana.org/time-zones 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 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 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 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 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 %changelog +* Fri Jun 12 2020 Jiri Vanek - 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 - 2020a-1 - Rebase to tzdata-2020a - Morocco will spring forward on 2020-05-31 rather than