Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')

Related: RHEL-47024
This commit is contained in:
Andrew Hughes 2024-08-04 23:16:12 +01:00
parent 9a948b5006
commit 871818d536

View File

@ -369,7 +369,12 @@
%global rpmrelease 1 %global rpmrelease 1
# Settings used by the portable build # Settings used by the portable build
%global portablerelease 1 %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 %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 # 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. - Switch to GA mode.
- Sync the copy of the portable specfile with the latest update - Sync the copy of the portable specfile with the latest update
- Add missing section headers in NEWS - 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. ** - ** This tarball is embargoed until 2024-07-16 @ 1pm PT. **
- Resolves: RHEL-47024 - Resolves: RHEL-47024