From 24d245d1ccb845f58037e0b797373f4143b849f8 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 22 Jun 2025 01:15:17 +0100 Subject: [PATCH] Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') - Related: RHEL-12216 --- java-11-openjdk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index a45859f..cdbc63d 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -385,10 +385,15 @@ %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 +# Portable suffix differs between RHEL and CentOS +%if 0%{?centos} == 0 +%global portablerhel 8 +%else %global portablerhel 9 +%endif %global portablesuffix el%{portablerhel} %global portablebuilddir /builddir/build/BUILD @@ -2479,6 +2484,10 @@ require "copy_jdk_configs.lua" %endif %changelog +* Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-3 +- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') +- Related: RHEL-12216 + * Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-2 - Update to jdk-11.0.21+9 (GA) - Sync the copy of the portable specfile with the latest update