From 4f817bff623917a9fbfd9220f7df9962e3ff04db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E7=AB=8B=E6=B4=8B?= Date: Tue, 16 Jul 2024 01:55:52 +0000 Subject: [PATCH] null the arg to solve openjdk-headless install error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 宋立洋 --- openjdk-11.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openjdk-11.spec b/openjdk-11.spec index 4a30320..e9cae91 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -762,7 +762,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 6 +Release: 7 # 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 @@ -1588,9 +1588,10 @@ else 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) -- the returns from copy_jdk_configs.lua should not affect this 'main', so it should run under all circumstances, except fatal error %post %{post_script %{nil}} @@ -1715,6 +1716,9 @@ cjc.mainProgram(arg) %changelog +* Tue Jul 16 2024 songliyang - 1.11.0.23.9-7 +- null the arg to solve openjdk-headless install error + * Thu Jun 20 2024 aoqi - 1.11.0.23.9-6 - update LoongArch64 port to 11.0.23 -- Gitee