Use el8 portable packages

This commit is contained in:
eabdullin 2024-08-12 10:56:31 +03:00
parent 2327903a25
commit 75be5786f3

View File

@ -393,11 +393,7 @@
# 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
@ -1264,7 +1260,7 @@ Provides: java-%{origin}-src%{?1} = %{epoch}:%{version}-%{release}
Name: java-%{javaver}-%{origin}
Version: %{newjavaver}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.alma.1
# Equivalent for the portable build
%global prelease %{?eaprefix}%{portablerelease}%{?extraver}
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons
@ -2511,6 +2507,9 @@ cjc.mainProgram(args)
%endif
%changelog
* Mon Aug 12 2024 Eduard Abdullin <eabdullin@almalinux.org> - 1:17.0.12.0.7-2.alma.1
- Use el8 portable packages
* Sun Aug 04 2024 Andrew Hughes <gnu.andrew@redhat.com> - 1:17.0.12.0.7-2
- Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9')
- Related: RHEL-52734