Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
- Related: RHEL-12210
This commit is contained in:
parent
a265343430
commit
3343782446
@ -351,10 +351,15 @@
|
|||||||
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
%global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u})
|
||||||
# eg jdk8u60-b27 -> b27
|
# eg jdk8u60-b27 -> b27
|
||||||
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
|
||||||
%global rpmrelease 3
|
%global rpmrelease 4
|
||||||
# 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 portablesuffix el8
|
%global portablesuffix el8
|
||||||
|
%else
|
||||||
|
%global portablesuffix el9
|
||||||
|
%endif
|
||||||
%global portablebuilddir /builddir/build/BUILD
|
%global portablebuilddir /builddir/build/BUILD
|
||||||
|
|
||||||
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
# Define milestone (EA for pre-releases, GA ("fcs") for releases)
|
||||||
@ -2877,6 +2882,10 @@ cjc.mainProgram(args)
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 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 <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-3
|
* Mon Oct 16 2023 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.392.b08-3
|
||||||
- Revert jcmd move as jcmd will not operate without tools.jar
|
- Revert jcmd move as jcmd will not operate without tools.jar
|
||||||
- Related: RHEL-13585
|
- Related: RHEL-13585
|
||||||
|
Loading…
Reference in New Issue
Block a user