From a3b6a330f1ef77a8c3df89d81da80a48def4ee1d Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Thu, 15 May 2025 15:19:28 +0100 Subject: [PATCH] Temporarily use a different portable version and release on RHEL while out of sync with CentOS - Related: RHEL-12224 --- java-11-openjdk.spec | 54 ++++++++++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 19 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 0c596ec..7eec4a5 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -364,7 +364,7 @@ %endif %endif %endif -%global oj_vendor_version (Red_Hat-%{version}-%{portablerelease}) +%global oj_vendor_version (Red_Hat-%{pversion}-%{prelease}) # Define IcedTea version used for SystemTap tapsets and desktop file %global icedteaver 6.0.0pre00-c848b93a8598 @@ -385,7 +385,7 @@ %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 9 # rpmrelease numbering must start at 2 to be later than the 8.6 RPM -%global rpmrelease 2 +%global rpmrelease 3 # Settings used by the portable build %global portablerelease 1 %global portablerhel 8 @@ -1274,7 +1274,14 @@ Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{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 11.0.25.0.9 +%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 @@ -1350,14 +1357,14 @@ Source19: README.md Source20: java-%{featurever}-openjdk-portable.specfile # Setup variables to reference correct sources -%global releasezip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz -%global staticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.static-libs.%{_arch}.tar.xz -%global docszip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.docs.%{_arch}.tar.xz -%global misczip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.misc.%{_arch}.tar.xz -%global slowdebugzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.slowdebug.jdk.%{_arch}.tar.xz -%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.slowdebug.static-libs.%{_arch}.tar.xz -%global fastdebugzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.fastdebug.jdk.%{_arch}.tar.xz -%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{version}-%{prelease}.portable.fastdebug.static-libs.%{_arch}.tar.xz +%global releasezip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.unstripped.jdk.%{_arch}.tar.xz +%global staticlibzip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.static-libs.%{_arch}.tar.xz +%global docszip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.docs.%{_arch}.tar.xz +%global misczip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.misc.%{_arch}.tar.xz +%global slowdebugzip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.slowdebug.jdk.%{_arch}.tar.xz +%global slowdebugstaticlibzip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.slowdebug.static-libs.%{_arch}.tar.xz +%global fastdebugzip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.fastdebug.jdk.%{_arch}.tar.xz +%global fastdebugstaticlibzip %{_jvmdir}/%{name}-%{pversion}-%{prelease}.portable.fastdebug.static-libs.%{_arch}.tar.xz ############################################ # @@ -1477,19 +1484,19 @@ BuildRequires: zip BuildRequires: unzip BuildRequires: javapackages-filesystem %if %{include_normal_build} -BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-unstripped = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} %endif %if %{include_fastdebug_build} -BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-devel-fastdebug = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs-fastdebug = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} %endif %if %{include_debug_build} -BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-devel-slowdebug = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-static-libs-slowdebug = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} %endif -BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{version}-%{prelease}.%{portablesuffix} -BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{version}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-docs = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} +BuildRequires: java-%{featurever}-openjdk-portable-misc = %{epoch}:%{pversion}-%{prelease}.%{portablesuffix} # Zero-assembler build requirement %ifarch %{zero_arches} BuildRequires: libffi-devel @@ -1960,7 +1967,7 @@ for suffix in %{build_loop} ; do mv java-%{featurever}-openjdk* ${installdir} # Fix build paths in ELF files so it looks like we built them - portablenvr="%{name}-%{VERSION}-%{prelease}.%{portablesuffix}.%{_arch}" + portablenvr="%{name}-%{pversion}-%{prelease}.%{portablesuffix}.%{_arch}" for file in $(find ${installdir} -type f) ; do if file ${file} | grep -q 'ELF'; then %{debugedit} -b %{portablebuilddir}/${portablenvr} -d $(pwd) -n ${file} @@ -2194,7 +2201,12 @@ if ! echo $suffix | grep -q "debug" ; then # Install Javadoc documentation install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir} cp -a ${docdir}/docs $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix} +%if 0%{?centos} == 0 +# Hack to use a later version on RHEL while CentOS and RHEL are out of sync + built_doc_archive=jdk-11.0.25+9-LTS-docs.zip +%else built_doc_archive=jdk-%{filever}%{ea_designator_zip}+%{buildver}%{lts_designator_zip}-docs.zip +%endif cp -a ${docdir}/${built_doc_archive} \ $RPM_BUILD_ROOT%{_javadocdir}/%{uniquejavadocdir -- $suffix}.zip fi @@ -2508,6 +2520,10 @@ end %endif %changelog +* Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-3 +- Temporarily use a different portable version and release on RHEL while out of sync with CentOS +- Related: RHEL-12224 + * Fri Oct 13 2023 Andrew Hughes - 1:11.0.21.0.9-2 - Update to jdk-11.0.21+9 (GA) - Sync the copy of the portable specfile with the latest update