From 568e8f3976407acc75c9320433ea578b0ae5f1c6 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Sun, 4 Aug 2024 22:32:08 +0100 Subject: [PATCH] Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') - Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') - Set rpmrelease to 2 - Related: RHEL-58785 --- java-17-openjdk.spec | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index ef86d0b..8d5100b 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -383,10 +383,15 @@ %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 10 # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 1 +%global rpmrelease 2 # 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 # 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 @@ -2491,6 +2496,11 @@ cjc.mainProgram(args) %endif %changelog +* Fri Oct 4 2024 Andrew Hughes - 1:17.0.13.0.10-0.2.ea +- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') +- Set rpmrelease to 2 +- Related: RHEL-58785 + * Fri Oct 4 2024 Thomas Fitzsimmons - 1:17.0.13.0.10-0.1.ea - Update to jdk-17.0.13+10 (EA) - Update .gitignore to ignore openjdk-17.0.13+10-ea.tar.xz