Use el9 portable packages

This commit is contained in:
Eduard Abdullin 2026-04-16 08:54:50 +00:00 committed by root
parent fa610ddf7b
commit b223316d50

View File

@ -359,6 +359,10 @@
%global portablerhel 9
%endif
%global portablebuilddir /builddir/build/BUILD
%if 0%{?almalinux}
%global portablesuffix el9
%endif
%global portablesuffix el%{portablerhel}
# Check if pandoc was available to generate docs (including man pages)
%if 0%{?portablerhel} == 8
@ -1251,7 +1255,7 @@ ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 riscv64
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
@ -1938,16 +1942,16 @@ sh %{SOURCE12} %{top_level_dir_name}
# Patch the JDK
# This syntax is deprecated:
# %patchN [...]
# %%patchN [...]
# and should be replaced with:
# %patch -PN [...]
# %%patch -PN [...]
# For example:
# %patch1001 -p1
# %%patch1001 -p1
# becomes:
# %patch -P1001 -p1
# %%patch -P1001 -p1
# The replacement format suggested by recent (circa Fedora 38) RPM
# deprecation messages:
# %patch N [...]
# %%patch N [...]
# is not backward-compatible with prior (circa RHEL-8) versions of
# rpmbuild.
pushd %{top_level_dir_name}
@ -2629,6 +2633,9 @@ exit 0
%endif
%changelog
* Thu Apr 16 2026 Eduard Abdullin <eabdullin@almalinux.org> - 1:25.0.2.0.10-2.alma.1
- Use el9 portable packages
* Wed Jan 28 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.2.0.10-2
- Bump rpmrelease for CentOS build
- Related: RHEL-139577