From f3305a472975557883e1aae90d95e487c2dab6e2 Mon Sep 17 00:00:00 2001 From: DXwangg Date: Thu, 12 Oct 2023 19:58:08 +0800 Subject: [PATCH] =?UTF-8?q?I87OFZ:openjdk-1.8.0=E7=BC=96=E8=AF=91=E6=8A=A5?= =?UTF-8?q?=E9=94=99lua=20script=20failed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjdk-1.8.0.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index 7de27fe..1dcddb0 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 >= 3.3 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: 10 +Release: 11 # 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 @@ -2389,10 +2389,8 @@ else return 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}} @@ -2529,6 +2527,9 @@ cjc.mainProgram(arg) %endif %changelog +* Thu Oct 12 2023 DXwangg - 1:1.8.0.382-b05.11 +- fix [EulerMaker] openjdk-1.8.0 build problem in openEuler-20.03-LTS-SP4:everything + * Mon Sep 25 2023 kuenking111 - 1:1.8.0.382-b05.10 - del useless code -- Gitee