From 334378244682e3811e11769a6d378cab6eedfaec Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 15 May 2025 02:06:00 +0100 Subject: [PATCH] Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') - Related: RHEL-12210 --- java-1.8.0-openjdk.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index b954ae7..d40372e 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -351,10 +351,15 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 3 +%global rpmrelease 4 # Settings used by the portable build %global portablerelease 1 +# Portable suffix differs between RHEL and CentOS +%if 0%{?centos} == 0 %global portablesuffix el8 +%else +%global portablesuffix el9 +%endif %global portablebuilddir /builddir/build/BUILD # Define milestone (EA for pre-releases, GA ("fcs") for releases) @@ -2877,6 +2882,10 @@ cjc.mainProgram(args) %endif %changelog +* Mon Oct 16 2023 Andrew Hughes - 1:1.8.0.392.b08-4 +- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') +- Related: RHEL-12210 + * Mon Oct 16 2023 Andrew Hughes - 1:1.8.0.392.b08-3 - Revert jcmd move as jcmd will not operate without tools.jar - Related: RHEL-13585