From c93a62d0f9bdbfddac891cae205fc424f278469d Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 17 Dec 2024 17:32:19 +0300 Subject: [PATCH] - Use el8 portable packages --- java-21-openjdk.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index f2465a8..a6311be 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -377,6 +377,10 @@ %endif %global portablebuilddir /builddir/build/BUILD +%if 0%{?almalinux} +%global portablesuffix el8 +%endif + # 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 %if %is_system_jdk # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -1287,7 +1291,7 @@ ExclusiveArch: %{aarch64} %{ppc64le} s390x x86_64 Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1 +Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}.1.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 @@ -2532,6 +2536,9 @@ cjc.mainProgram(args) %endif %changelog +* Tue Dec 17 2024 Eduard Abdullin - 1:21.0.5.0.11-2.1.alma.1 +- Use el8 portable packages + * Tue Oct 29 2024 Troy Dawson - 1:21.0.5.0.11-2.1 - Bump release for October 2024 mass rebuild: Resolves: RHEL-64018