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
This commit is contained in:
Andrew Hughes 2024-08-04 22:32:08 +01:00 committed by Thomas Fitzsimmons
parent fd11e577fd
commit 568e8f3976

View File

@ -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 <gnu.andrew@redhat.com> - 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 <fitzsim@redhat.com> - 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