From ad447d969447997d8eca43aaca201632ef4ab60c Mon Sep 17 00:00:00 2001 From: noah Date: Wed, 5 Jan 2022 18:48:01 +0800 Subject: [PATCH] =?UTF-8?q?I4PHH7:=20openjdk-1.8.0=E7=BC=96=E8=AF=91?= =?UTF-8?q?=E6=8A=A5=E9=94=99lua=20script=20failed=20=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=EF=BC=9A22.03=20LTS=20=E9=80=89=E5=9E=8B=E5=8D=87=E7=BA=A7?= =?UTF-8?q?=EF=BC=8C=E5=8D=87=E7=BA=A7lua=E7=89=88=E6=9C=AC=E5=92=8Crpm?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=90=8E=EF=BC=8Copenjdk-1.8.0=E7=BC=96?= =?UTF-8?q?=E8=AF=91=E6=8A=A5=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 | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index ee40fb0..e261ab8 100644 --- a/openjdk-1.8.0.spec +++ b/openjdk-1.8.0.spec @@ -820,7 +820,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.3 +Requires: copy-jdk-configs >= 3.9 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -916,7 +916,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 @@ -2050,7 +2050,13 @@ 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" -local debug = false + +if (os.getenv("debug") == "true") then + debug = true; + print("cjc: in spec debug is on") +else + debug = false; +end SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2079,8 +2085,9 @@ 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}"} -require "copy_jdk_configs.lua" +cjc.mainProgram(arg) %post %{post_script %{nil}} @@ -2217,6 +2224,9 @@ require "copy_jdk_configs.lua" %endif %changelog +* Wed Jan 05 2021 noah - 1:1.8.0.312-b07.11 +- adapted to newst cjc to fix issue with rpm 4.17 + * Tue Dec 21 2021 kuenking111 - 1:1.8.0.312-b07.10 - delete stack protection -- Gitee