diff --git a/openjdk-11.spec b/openjdk-11.spec index 99b2b1847907cece9e89066206d02f24f38c248d..0832382700e5741e10f20774545db5cdb55e736f 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -651,7 +651,7 @@ Requires: lksctp-tools%{?_isa} # 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 @@ -740,7 +740,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +Release: 2 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -1513,12 +1513,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" @@ -1547,9 +1542,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}} @@ -1674,6 +1668,9 @@ cjc.mainProgram(arg) %changelog +* Tue May 31 2022 kuenking111 - 1:11.0.15.10-2 +- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires + * Thu Apr 28 2022 kuenking111 - 1:11.0.15.10-1 - add fix_X509TrustManagerImpl_symantec_distrust.patch