Specify portablerelease and rpmrelease (always 0 for portables) in the Release field

Resolves: RHEL-212311
This commit is contained in:
Andrew Hughes 2026-06-29 23:53:52 +01:00
parent a725db211e
commit 338c909a94

View File

@ -19,7 +19,7 @@
# eg jdk8u60-b27 -> b27
%global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-})
%global portablerelease 1
%global rpmrelease 1
%global rpmrelease 1
# Define IcedTea version used for SystemTap tapsets and desktop files
%global icedteaver 3.15.0
@ -55,7 +55,7 @@
Name: %{compatiblename}
Version: %{javaver}.%{updatever}.%{buildver}
Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist}
Release: %{?eaprefix}%{portablerelease}.%{rpmrelease}%{?extraver}%{?dist}
%global fullversion %{compatiblename}-%{version}-%{release}
@ -88,7 +88,8 @@ URL: http://openjdk.java.net/
# Settings used by the portable build
# 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
%global portablerhel 8
%global portablebuilddir /builddir/build/BUILD
@ -2712,7 +2713,7 @@ cjc.mainProgram(args)
%endif
%changelog
* Fri Jul 17 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-1
* Fri Jul 17 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.502.b07-1.1
- Update to 8u502-b07 (GA).
- Update release notes for 8u502-b07.
- Bump lcms2 version to 2.19.1 following JDK-8321489, JDK-8348110, JDK-8375065 & JDK-8383354
@ -2722,6 +2723,7 @@ cjc.mainProgram(args)
- 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
- Explictly define supported architectures
- Specify portablerelease and rpmrelease (always 0 for portables) in the Release field
- Sync the copy of the portable specfile with the latest update
- Sync portable naming with later JDKs, due to adoption of <compatiblename> by portable
- Drop <pversion> which is a redundant alias for version now
@ -2729,7 +2731,7 @@ cjc.mainProgram(args)
- Resolves: RHEL-212354
- Resolves: RHEL-188874
- Resolves: RHEL-212132
- Related: RHEL-212311
- Resolves: RHEL-212311
* Fri Apr 17 2026 Andrew Hughes <gnu.andrew@redhat.com> - 1:1.8.0.492.b09-1
- Update to 8u492-b09 (GA)