From 0eeb4a6e133c5efadb90a511da40c774b82b7363 Mon Sep 17 00:00:00 2001 From: Jiri Vanek Date: Fri, 7 May 2021 14:43:18 +0200 Subject: [PATCH] removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction --- java-11-openjdk.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index c530e3d..89a78b3 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -345,7 +345,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 -%global rpmrelease 2 +%global rpmrelease 3 #%%global tagsuffix "" # 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 @@ -1015,7 +1015,7 @@ Requires: lksctp-tools%{?_isa} # 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 %endif # for printing support @@ -2102,10 +2102,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}} @@ -2292,6 +2292,9 @@ cjc.mainProgram(arg) %endif %changelog +* Fri May 07 2021 Jiri Vanek - 1:11.0.11.0.9-3 +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction + * Fri Apr 30 2021 Severin Gehwolf - 1:11.0.11.0.9-2 - Remove -fcommon work-around as the OpenJDK 11 code has been fixed.