From c95461358dfb828aeadc4af86783727499ea5b77 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Mon, 23 May 2022 10:04:10 +0800 Subject: [PATCH] =?UTF-8?q?I57XLW:=20openEuler:20.03:LTS:SP1=20=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E4=B8=ADopenjdk-1.8.0=E5=90=8C=E6=AD=A5master?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BE=9D=E8=B5=96SP1=E4=B8=AD=E6=9C=AA?= =?UTF-8?q?=E9=9B=86=E6=88=90=E9=AB=98=E7=89=88=E6=9C=ACcopy-java-config?= =?UTF-8?q?=20=E5=AF=BC=E8=87=B4=E6=89=B9=E9=87=8Fjava=E5=8C=85unresolvabl?= =?UTF-8?q?e?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- openjdk-1.8.0.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/openjdk-1.8.0.spec b/openjdk-1.8.0.spec index f1c6fec..75cc3b2 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.9 +Requires: copy-jdk-configs >= 3.3 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: 2 +Release: 3 # 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 @@ -2064,13 +2064,7 @@ 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" - -if (os.getenv("debug") == "true") then - debug = true; - print("cjc: in spec debug is on") -else - debug = false; -end +local debug = false SOURCE1 = "%{rpm_state_dir}/copy_jdk_configs.lua" SOURCE2 = "%{_libexecdir}/copy_jdk_configs.lua" @@ -2099,9 +2093,8 @@ 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}"} -cjc.mainProgram(arg) +require "copy_jdk_configs.lua" %post %{post_script %{nil}} @@ -2238,6 +2231,9 @@ cjc.mainProgram(arg) %endif %changelog +* Fri May 20 2022 noah - 1:1.8.0.332-b09.3 +- downgrade copy-jdk-configs from 3.9 to 3.3 in Requires + * Thu Apr 28 2022 kuenking111 - 1:1.8.0.332-b09.2 - add fix_X509TrustManagerImpl_symantec_distrust.patch -- Gitee