Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
- Related: RHEL-12216
This commit is contained in:
parent
b76fabc930
commit
24d245d1cc
@ -385,10 +385,15 @@
|
|||||||
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
%global top_level_dir_name_backup %{top_level_dir_name}-backup
|
||||||
%global buildver 9
|
%global buildver 9
|
||||||
# rpmrelease numbering must start at 2 to be later than the 9.0 RPM
|
# rpmrelease numbering must start at 2 to be later than the 9.0 RPM
|
||||||
%global rpmrelease 2
|
%global rpmrelease 3
|
||||||
# Settings used by the portable build
|
# Settings used by the portable build
|
||||||
%global portablerelease 1
|
%global portablerelease 1
|
||||||
|
# Portable suffix differs between RHEL and CentOS
|
||||||
|
%if 0%{?centos} == 0
|
||||||
|
%global portablerhel 8
|
||||||
|
%else
|
||||||
%global portablerhel 9
|
%global portablerhel 9
|
||||||
|
%endif
|
||||||
%global portablesuffix el%{portablerhel}
|
%global portablesuffix el%{portablerhel}
|
||||||
%global portablebuilddir /builddir/build/BUILD
|
%global portablebuilddir /builddir/build/BUILD
|
||||||
|
|
||||||
@ -2479,6 +2484,10 @@ require "copy_jdk_configs.lua"
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Fri Oct 13 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-3
|
||||||
|
- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
|
||||||
|
- Related: RHEL-12216
|
||||||
|
|
||||||
* Fri Oct 13 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-2
|
* Fri Oct 13 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:11.0.21.0.9-2
|
||||||
- Update to jdk-11.0.21+9 (GA)
|
- Update to jdk-11.0.21+9 (GA)
|
||||||
- Sync the copy of the portable specfile with the latest update
|
- Sync the copy of the portable specfile with the latest update
|
||||||
|
Loading…
Reference in New Issue
Block a user