diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 69ed45d8a822eede518521c8c84a798ed4f6fa4c..5f324d3a29a53c8ddb981117b39650bd4617d366 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -176,7 +176,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 35 -%global rpmrelease 1 +%global rpmrelease 2 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -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 >= 4.0 +Requires: copy-jdk-configs >= 3.3 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -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" @@ -1646,9 +1641,8 @@ else end end -- run content of included file with fake args -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) +require "copy_jdk_configs.lua" %post %{post_script %{nil}} @@ -1773,6 +1767,9 @@ cjc.mainProgram(arg) %changelog +* Thu Oct 12 2023 DXwangg - 1:21.0.0.35-2-rolling +- fix [EulerMaker] openjdk-latest build problem in openEuler-20.03-LTS-SP4:everything + * Sat Oct 7 2023 kuenking111 - 1:21.0.0.35-0-rolling * Mon Aug 07 2023 misaka00251 - 1:20.0.2.9-1-rolling