From 871818d536347a1098a9bbdac3b4e6dd32ebd555 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 4 Aug 2024 23:16:12 +0100 Subject: [PATCH] Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') Related: RHEL-47024 --- java-21-openjdk.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 152f0fc..b3f7c35 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -369,7 +369,12 @@ %global rpmrelease 1 # Settings used by the portable build %global portablerelease 1 -%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el9} +# Portable suffix differs between RHEL and CentOS +%if 0%{?centos} == 0 +%global portablesuffix %{?pkgos:el7_9}%{!?pkgos:el8} +%else +%global portablesuffix el9 +%endif %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 @@ -2533,6 +2538,7 @@ cjc.mainProgram(args) - Switch to GA mode. - Sync the copy of the portable specfile with the latest update - Add missing section headers in NEWS +- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. ** - Resolves: RHEL-47024