From 2e15fb4a88909e352d9ab63453fb05aa4755da7e Mon Sep 17 00:00:00 2001 From: Jiri Date: Tue, 22 Jun 2021 11:30:12 +0200 Subject: [PATCH] removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction Resolves: rhbz#1967813 --- java-1.8.0-openjdk.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index fa74527..c4f0c94 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -311,7 +311,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 1 +%global rpmrelease 2 # Define milestone (EA for pre-releases, GA ("fcs") for releases) # Release will be (where N is usually a number starting at 1): # - 0.N%%{?extraver}%%{?dist} for EA releases, @@ -1107,7 +1107,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 # for printing support Requires: cups-libs @@ -2368,10 +2368,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}} @@ -2549,6 +2549,9 @@ cjc.mainProgram(arg) %endif %changelog +* Tue Jun 22 2021 Jiri Vanek - 1:1.8.0.292.b10-2 +- removed cjc backward comaptiblity, to fix when both rpm 4.16 and 4.17 are in transaction + * Tue Jun 22 2021 Jiri Vanek - 1:1.8.0.292.b10-1 - adapted to newst cjc to fix issue with rpm 4.17