diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 611703a..e75e853 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -53,7 +53,7 @@ Name: %{compatiblename} Version: %{newjavaver}.%{buildver} -Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} +Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist} %global fullversion %{compatiblename}-%{version}-%{release} @@ -99,7 +99,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} @@ -2565,7 +2566,7 @@ cjc.mainProgram(args) %endif %changelog -* Sat Jul 18 2026 Andrew Hughes - 1:21.0.11.0.10-3 +* Sat Jul 18 2026 Andrew Hughes - 1:21.0.11.0.10-1.3 - Update tagging scripts to include signature checks and correctly handle gating - Update tagged versions to include 9.8.0-z, 9.9.0, 10.2-z & 10.3. - Add gating scripts to simplify obtaining results and waiving issues @@ -2579,13 +2580,14 @@ cjc.mainProgram(args) - * scripts/builds/waive_usual_tier0.sh: Remove redundant 'test "x"' usage. - Remove macro references in comments where possible (%dnl not compatible enough yet) - Move version information and core NVR definitions back towards the top of the file +- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field - Resolves: RHEL-212332 - Resolves: RHEL-212334 - Resolves: RHEL-212336 - Resolves: RHEL-151193 -- Related: RHEL-212341 +- Resolves: RHEL-212341 -* Sat Jul 18 2026 Thomas Fitzsimmons - 1:21.0.11.0.10-3 +* Sat Jul 18 2026 Thomas Fitzsimmons - 1:21.0.11.0.10-1.3 - Disable abidiff inspection in rpminspect.yaml to avoid an out-of-memory error on the CentOS test farm - See: https://docs.testing-farm.io/Testing%20Farm/0.1/errors.html#TFE-1 - Resolves: RHEL-151167