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

building 6+7 tzdata by jdk8, norma tzdata by 17

Browse Source
This commit is contained in:
Jiri Vanek 2022-02-08 16:24:58 +01:00
parent 3372efffde
commit 150c8a0b8d
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tzdata.spec
View File

@ -17,6 +17,7 @@ Patch003: 0003-continue-to-ship-posixrules.patch
BuildRequires: make BuildRequires: make
BuildRequires: gawk, glibc, perl-interpreter BuildRequires: gawk, glibc, perl-interpreter
BuildRequires: java-devel BuildRequires: java-devel
BuildRequires: java-1.8.0-devel
BuildRequires: glibc-common >= 2.5.90-7 BuildRequires: glibc-common >= 2.5.90-7
Conflicts: glibc-common <= 2.3.2-63 Conflicts: glibc-common <= 2.3.2-63
BuildArchitectures: noarch BuildArchitectures: noarch
@ -112,7 +113,7 @@ JAVA_FILES="rearguard/africa rearguard/antarctica rearguard/asia \
# Java 6/7 tzdata # Java 6/7 tzdata
pushd javazic 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 popd
java -classpath javazic/ rht.tools.javazic.Main -V %{version} \ 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 # Java 8 tzdata
pushd javazic-1.8 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 popd
java -classpath javazic-1.8 build.tools.tzdb.TzdbZoneRulesCompiler \ 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 %changelog
* Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2021e-3 * Sat Feb 05 2022 Jiri Vanek <jvanek@redhat.com> - 2021e-3
- Rebuilt for java-17-openjdk as system jdk - 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 <releng@fedoraproject.org> - 2021e-2 * Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2021e-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild