From 23527dfb16405e657b215dd40325cb25ae2781e9 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Fri, 1 Sep 2023 21:05:21 +0800 Subject: [PATCH] =?UTF-8?q?I7XU00:=E3=80=90arm\x86=E3=80=91java-1.8.0-open?= =?UTF-8?q?jdk-headless=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-1.8.0.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 73c65aa..86b5af2 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -829,7 +829,7 @@ Requires: nss-softokn%{?_isa} %{NSSSOFTOKN_BUILDTIME_VERSION} # 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 >= 4.0 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -925,7 +925,7 @@ Provides: java-%{javaver}-%{origin}-accessibility%{?1} = %{epoch}:%{version}-%{r Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} -Release: 5 +Release: 6 # 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 @@ -2342,10 +2342,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}} @@ -2482,6 +2482,9 @@ cjc.mainProgram(arg) %endif %changelog +* Wed Sep 1 2023 noah - 1:1.8.0.382-b05.6 +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction + * Wed Aug 30 2023 kuenking111 - 1:1.8.0.382-b05.5 - del 0022-8198510-Enable-UseDynamicNumberOfGCThreads-by-defaul.patch -- Gitee