From 8ae09deeee67776fc14d6500a6b0019da42413a0 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Fri, 12 Aug 2022 21:47:24 +0800 Subject: [PATCH] =?UTF-8?q?I5M04V:=20=E3=80=90SP1=20update=2020220811?= =?UTF-8?q?=E3=80=91java-11-openjdk=E5=9C=A8SP1=20update=5F20220811?= =?UTF-8?q?=E5=AE=89=E8=A3=85=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjdk-11.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/openjdk-11.spec b/openjdk-11.spec index b929820..5946fcd 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: 0 +Release: 1 # 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 @@ -1512,13 +1512,7 @@ done -- whether copy-jdk-configs is installed or not. If so, then configs are copied -- (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 +1541,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 +1667,9 @@ cjc.mainProgram(arg) %changelog +* Fri Aug 12 2022 noah - 1:11.0.16.8-1 +- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires + * Tue Jul 26 2022 kuenking111 - 1:11.0.16.8-0 - modified 8224675-Late-GC-barrier-insertion-for-ZGC.patch - modified ZGC-Redesign-C2-load-barrier-to-expand-on-th.patch -- Gitee