From d47aeada5e07f8ca60662871431ad5395cb14e4d Mon Sep 17 00:00:00 2001
From: dongbohe <hedongbo@huawei.com>
Date: Fri, 8 Sep 2023 23:42:16 +0800
Subject: [PATCH] =?UTF-8?q?I7XX6A:=E3=80=90arm\x86=E3=80=91java-latest-ope?=
 =?UTF-8?q?njdk-headless=E5=92=8Cjava-latest-openjdk-devel=E5=AE=89?=
 =?UTF-8?q?=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-latest.spec | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/openjdk-latest.spec b/openjdk-latest.spec
index c58366c..8b628bf 100644
--- a/openjdk-latest.spec
+++ b/openjdk-latest.spec
@@ -1635,8 +1635,10 @@ else
   return
   end
 end
-arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
-cjc.mainProgram(arg)
+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"
+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}}
-- 
Gitee