Use el9 portable packages
This commit is contained in:
parent
be73aaae60
commit
3674bbb909
@ -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
|
||||
@ -1937,16 +1941,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}
|
||||
@ -2626,6 +2630,9 @@ exit 0
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Tue Dec 23 2025 Eduard Abdullin <eabdullin@almalinux.org> - 1:25.0.1.0.8-2.alma.1
|
||||
- Use el9 portable packages
|
||||
|
||||
* Mon Dec 08 2025 Andrew Hughes <gnu.andrew@redhat.com> - 1:25.0.1.0.8-2
|
||||
- Incorporate new FIPS patch for 25u
|
||||
- Drop static libjvm.a following adjusted build target for portable build
|
||||
|
||||
Loading…
Reference in New Issue
Block a user