diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 29491a1ed771e8ce3697569ded71fa7da02a6475..2f46dc278a21494d2d1a517bacdfee52d88c96f6 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -788,7 +788,7 @@ Requires: tzdata-java >= 2015d # tool to copy jdk's configs - should be Recommends only, but then only dnf/yum enforce it, # not rpm transaction and so no configs are persisted when pure rpm -u is run. It may be # considered as regression -Requires: copy-jdk-configs >= 3.9 +Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -1009,7 +1009,7 @@ BuildRequires: pkgconfig BuildRequires: xorg-x11-proto-devel BuildRequires: zip BuildRequires: javapackages-filesystem -BuildRequires: java-latest-openjdk-devel +# BuildRequires: java-latest-openjdk-devel # Zero-assembler build requirement %ifnarch %{jit_arches} BuildRequires: libffi-devel @@ -1482,7 +1482,7 @@ EOF #grep 'JavaCallWrapper::JavaCallWrapper' gdb.out # Check src.zip has all sources. See RHBZ#1130490 -#jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' +$JAVA_HOME/bin/jar -tf $JAVA_HOME/lib/src.zip | grep 'sun.misc.Unsafe' # Check class files include useful debugging information $JAVA_HOME/bin/javap -l java.lang.Object | grep "Compiled from" @@ -1612,12 +1612,7 @@ done -- (copy_jdk_configs from %%{_libexecdir} used) or not copied at all local posix = require "posix" -if (os.getenv("debug") == "true") then - debug = true; - print("cjc: in spec debug is on") -else - debug = false; -end +local debug = false SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -1645,10 +1640,10 @@ else return end end --- run content of included file with fake args +arg = nil ; -- it is better to null the arg up, no meter if they exists or not, and use cjc as module in unified way, instead of relaying on "main" method during require "copy_jdk_configs.lua" cjc = require "copy_jdk_configs.lua" -arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} -cjc.mainProgram(arg) +args = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"} +cjc.mainProgram(args) %post %{post_script %{nil}} @@ -1773,7 +1768,12 @@ cjc.mainProgram(arg) %changelog -* Sat Oct 7 2023 kuenking111 - 1:21.0.0.35-0-rolling +* Mon Nov 13 2023 kuenking111 - 1:21.0.0.35-0-rolling +- upgrade to jdk21+35 +- fix java-latest-openjdk-headless install failed + +* Sat Sep 2 2023 noah - 1:20.0.2.9-2-rolling +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction * Mon Aug 07 2023 misaka00251 - 1:20.0.2.9-1-rolling - Add riscv64 to jit_arches