From 0bf763f256e98e44075a04ac1d6c346fd21229a5 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 - Remove obsolete hack to hardcode newer portable version on RHEL Related: RHEL-101648 Related: RHEL-102312 Related: RHEL-97496 --- java-1.8.0-openjdk.spec | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/java-1.8.0-openjdk.spec b/java-1.8.0-openjdk.spec index 309ebde..2ec93de 100644 --- a/java-1.8.0-openjdk.spec +++ b/java-1.8.0-openjdk.spec @@ -359,7 +359,7 @@ # eg jdk8u60-b27 -> b27 %global buildver %(VERSION=%{version_tag}; echo ${VERSION##*-}) # rpmrelease numbering must start at 2 to be later than the 9.0 RPM -%global rpmrelease 3 +%global rpmrelease 4 # Settings used by the portable build %global portablerelease 1 # Portable suffix differs between RHEL and CentOS @@ -1388,14 +1388,8 @@ Name: java-%{javaver}-%{origin} Version: %{javaver}.%{updatever}.%{buildver} 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.462.b08 -%global prelease 1 -%else %global pversion %{version} %global prelease %{?eaprefix}%{portablerelease}%{?extraver} -%endif # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -2676,10 +2670,6 @@ if ! echo $suffix | grep -q "debug" ; then cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} built_doc_archive=jdk-%{javaver}_%{updatever}%{milestone_version}$suffix-%{buildver}-docs.zip %ifarch %{portable_build_arches} -%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}_462-b08-docs.zip -%endif cp -a ${docdir}/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip %else cp -a %{installoutputdir -- $suffix}/bundles/$built_doc_archive $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip @@ -2972,6 +2962,13 @@ cjc.mainProgram(args) %endif %changelog +* Thu Jul 10 2025 Andrew Hughes - 1:1.8.0.462.b08-4 +- Bump rpmrelease for CentOS build +- Remove obsolete hack to hardcode newer portable version on RHEL +- Related: RHEL-101648 +- Related: RHEL-102312 +- Related: RHEL-97496 + * Thu Jul 10 2025 Andrew Hughes - 1:1.8.0.462.b08-3 - Update to 8u462-b08 (GA) - Update release notes for 8u462-b08.