From a1bdc5c2d589f2ebe690369d1c023692140027d0 Mon Sep 17 00:00:00 2001
From: dongbohe <hedongbo@huawei.com>
Date: Wed, 13 Sep 2023 14:53:05 +0800
Subject: [PATCH] =?UTF-8?q?I7XWWC:=E3=80=9022.03=20LTS=20update20230830?=
 =?UTF-8?q?=E3=80=91=E3=80=90arm\x86=E3=80=91java-1.8.0-openjdk=E5=AD=90?=
 =?UTF-8?q?=E5=8C=85=E5=85=A8=E9=87=8F=E5=8D=87=E7=BA=A7=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 | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec
index ff89fdc..bdd9588 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 >= 4.0
+Requires: copy-jdk-configs >= 3.3
 OrderWithRequires: copy-jdk-configs
 # for printing support
 Requires: cups-libs
@@ -2340,10 +2340,8 @@ else
   return
   end
 end
-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)
+arg = {"--currentjvm", "%{uniquesuffix %{nil}}", "--jvmdir", "%{_jvmdir %{nil}}", "--origname", "%{name}", "--origjavaver", "%{javaver}", "--arch", "%{_arch}", "--temp", "%{rpm_state_dir}/%{name}.%{_arch}"}
+require "copy_jdk_configs.lua"
 
 %post
 %{post_script %{nil}}
-- 
Gitee