From 1086a327a1550ccb623c5943e51c17a048c27236 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 4 Jul 2025 19:01:25 +0100 Subject: [PATCH] Bump rpmrelease for CentOS build and update RHEL version hack following July 2025 update Related: RHEL-32398 --- java-1.8.0-openjdk.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 6ecaeea..7b44ca6 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -343,7 +343,7 @@ %global updatever %(VERSION=%{whole_update}; echo ${VERSION##*u}) # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 2 %global portablesuffix el8 @@ -1281,7 +1281,7 @@ Release: %{?eaprefix}%{rpmrelease}%{?extraver}%{?dist} # Equivalent for the portable build # Hack to use a later version on RHEL while CentOS and RHEL are out of sync %if 0%{?centos} == 0 -%global pversion 1.8.0.452.b09 +%global pversion 1.8.0.462.b08 %global prelease 1 %else %global pversion %{version} @@ -2281,7 +2281,7 @@ if ! echo $suffix | grep -q "debug" ; then built_doc_archive=jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip %if 0%{?centos} == 0 # Hack to use a later version on RHEL while CentOS and RHEL are out of sync - built_doc_archive=jdk-%{javaver}_452-b09-docs.zip + built_doc_archive=jdk-%{javaver}_462-b08-docs.zip %endif cp -a ${docdir}/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi @@ -2665,6 +2665,10 @@ cjc.mainProgram(args) %endif %changelog +* Mon Apr 08 2024 Andrew Hughes - 1:1.8.0.412.b08-3 +- Bump rpmrelease for CentOS build and update RHEL version hack following July 2025 update +- Related: RHEL-32398 + * Mon Apr 08 2024 Andrew Hughes - 1:1.8.0.412.b08-2 - Update to shenandoah-jdk8u412-b08 (GA) - Switch to GA mode.