From 3674bbb90998e8461673e5080e2fbc8960e8dbcc Mon Sep 17 00:00:00 2001 From: Eduard Abdullin Date: Tue, 23 Dec 2025 08:10:46 +0000 Subject: [PATCH] Use el9 portable packages --- SPECS/java-25-openjdk.spec | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/SPECS/java-25-openjdk.spec b/SPECS/java-25-openjdk.spec index 0dafeee..7ba5d66 100644 --- a/SPECS/java-25-openjdk.spec +++ b/SPECS/java-25-openjdk.spec @@ -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 - 1:25.0.1.0.8-2.alma.1 +- Use el9 portable packages + * Mon Dec 08 2025 Andrew Hughes - 1:25.0.1.0.8-2 - Incorporate new FIPS patch for 25u - Drop static libjvm.a following adjusted build target for portable build