From e5c975d7200949a605585e9ed4054b4e3ceb70f3 Mon Sep 17 00:00:00 2001 From: dongbohe Date: Sat, 2 Sep 2023 10:04:04 +0800 Subject: [PATCH] =?UTF-8?q?=20I7XX6G:=E3=80=90arm\x86=E3=80=91java-latest-?= =?UTF-8?q?openjdk-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 | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/openjdk-latest.spec b/openjdk-latest.spec index 70909e5..7f8a936 100644 --- a/openjdk-latest.spec +++ b/openjdk-latest.spec @@ -176,7 +176,7 @@ %global top_level_dir_name %{origin} %global minorver 0 %global buildver 9 -%global rpmrelease 1 +%global rpmrelease 2 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -786,7 +786,7 @@ Requires: tzdata-java >= 2015d # 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 >= 4.0 OrderWithRequires: copy-jdk-configs # for printing support Requires: cups-libs @@ -1640,10 +1640,10 @@ else return 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) %post %{post_script %{nil}} @@ -1768,6 +1768,9 @@ cjc.mainProgram(arg) %changelog +* Sat Sep 2 2023 noah - 1:20.0.2.9-2-rolling +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction + * Mon Aug 07 2023 misaka00251 - 1:20.0.2.9-1-rolling - Add riscv64 to jit_arches -- Gitee