From 12da7e88e07475e1b2886b9dc647573da6835334 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 12 Apr 2024 16:48:02 +0100 Subject: [PATCH] Define portablesuffix according to whether pkgos is defined or not Related: RHEL-30943 --- java-21-openjdk.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 994459a..ed66122 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -354,7 +354,7 @@ %global rpmrelease 2 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix el7_9 +%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8} %global portablebuilddir /builddir/build/BUILD # 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 @@ -2486,6 +2486,7 @@ require "copy_jdk_configs.lua" * Fri Apr 12 2024 Andrew Hughes - 1:21.0.2.0.13-2 - Disable setting pkgos to rhel7 to revert to the openjdk-portable-rhel-8 version - Sync the copy of the portable specfile with the latest update +- Define portablesuffix according to whether pkgos is defined or not - Related: RHEL-30943 * Tue Jan 09 2024 Andrew Hughes - 1:21.0.2.0.13-1