From 150c8a0b8d3e56d2ead9aa11de35307c399744a0 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Tue, 8 Feb 2022 16:24:58 +0100 Subject: [PATCH] building 6+7 tzdata by jdk8, norma tzdata by 17 --- tzdata.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/tzdata.spec b/tzdata.spec index 71d2d0a..9c74b27 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -17,6 +17,7 @@ Patch003: 0003-continue-to-ship-posixrules.patch BuildRequires: make BuildRequires: gawk, glibc, perl-interpreter BuildRequires: java-devel +BuildRequires: java-1.8.0-devel BuildRequires: glibc-common >= 2.5.90-7 Conflicts: glibc-common <= 2.3.2-63 BuildArchitectures: noarch @@ -112,7 +113,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \ # Java 6/7 tzdata pushd javazic -javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` +/usr/lib/jvm/java-1.8.0-openjdk/bin/javac -source 1.6 -target 1.6 -classpath . `find . -name \*.java` popd java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ @@ -121,7 +122,7 @@ java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ # Java 8 tzdata pushd javazic-1.8 -javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` +/usr/lib/jvm/java-17-openjdk/bin/javac -source 1.8 -target 1.8 -classpath . `find . -name \*.java` popd java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ @@ -153,6 +154,8 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %changelog * Sat Feb 05 2022 Jiri Vanek - 2021e-3 - Rebuilt for java-17-openjdk as system jdk +- to keep the legacy tzdata, now build requires both jdk8 and system. +- I recomed to put legacy tz data to separate subpkg or to drop them all * Sat Jan 22 2022 Fedora Release Engineering - 2021e-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild