From 6fe56ef268fc6b30cb00e59c1af55ea84aaa5521 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Mon, 29 Jun 2026 23:53:52 +0100 Subject: [PATCH] Specify portablerelease and rpmrelease (always 0 for portables) in the Release field Resolves: RHEL-210972 --- java-25-openjdk.spec | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/java-25-openjdk.spec b/java-25-openjdk.spec index 991dead..a112e8e 100644 --- a/java-25-openjdk.spec +++ b/java-25-openjdk.spec @@ -9,8 +9,8 @@ %global updatever 3 %global patchver 0 %global buildver 9 -%global portablerelease 1 -%global rpmrelease 2 +%global portablerelease 2 +%global rpmrelease 1 # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 @@ -58,7 +58,7 @@ Name: %{compatiblename} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist} %global fullversion %{compatiblename}-%{version}-%{release} @@ -104,7 +104,8 @@ URL: http://openjdk.java.net/ # Define the root name of the portable packages %global pkgnameroot java-%{featurever}-%{origin}-portable%{?pkgos:-%{pkgos}} # Release field for the portable build -%global prelease %{?eaprefix}%{portablerelease}%{?extraver} +# The rpmrelease field is always zero for portables +%global prelease %{?eaprefix}%{portablerelease}.0%{?extraver} # Portable suffix differs between RHEL and CentOS %if 0%{?centos} == 0 %global portablerhel %{?pkgos:7_9}%{!?pkgos:8} @@ -2594,7 +2595,7 @@ exit 0 %endif %changelog -* Tue Jul 14 2026 Andrew Hughes - 1:25.0.3.0.9-2 +* Tue Jul 14 2026 Andrew Hughes - 1:25.0.3.0.9-2.1 - Cleanup tagging and gating scripts to appease shellcheck: - * scripts/builds/build_vanilla.sh: Use an array to handle the varying arguments to rhpkg. - * scripts/builds/check_signatures.sh: Quote variable usage. @@ -2608,7 +2609,7 @@ exit 0 - Related: RHEL-155327 - Related: RHEL-155339 - Resolves: RHEL-150977 -- Related: RHEL-210972 +- Resolves: RHEL-210972 * Sat Apr 18 2026 Andrew Hughes - 1:25.0.3.0.9-1 - Update to jdk-25.0.3+9 (GA)