From b2180eaa35639ebe7340bba8f0fba8ed345eb410 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Fri, 26 Jul 2024 00:43:13 +0100 Subject: [PATCH] Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10 Related: RHEL-58798 --- java-21-openjdk.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 1ecfa4c..80c4c03 100644 --- a/java-21-openjdk.spec +++ b/java-21-openjdk.spec @@ -227,7 +227,13 @@ %global hotspot_target hotspot # debugedit tool for rewriting ELF file paths +%if 0%{?rhel} >= 10 +# From RHEL 10, the tool is in its own package installed in the usual location +%global debugedit %{_bindir}/debugedit +%else +# On earlier versions of RHEL, it is part of the rpm package %global debugedit %{_rpmconfigdir}/debugedit +%endif # Filter out flags from the optflags macro that cause problems with the OpenJDK build # We filter out -O flags so that the optimization of HotSpot is not lowered from O3 to O2 @@ -1434,6 +1440,10 @@ BuildRequires: automake BuildRequires: alsa-lib-devel BuildRequires: binutils BuildRequires: cups-devel +# From RHEL 10, debugedit is in its own package +%if 0%{?rhel} >= 10 +BuildRequires: debugedit +%endif BuildRequires: desktop-file-utils # elfutils only are OK for build without AOT BuildRequires: elfutils-devel @@ -2521,6 +2531,7 @@ require "copy_jdk_configs.lua" %changelog * Mon Oct 07 2024 Andrew Hughes - 1:21.0.4.0.7-2 - Vary portablesuffix depending on whether we are on RHEL ('el8') or CentOS ('el9') +- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10 - Related: RHEL-58798 * Fri Jul 12 2024 Andrew Hughes - 1:21.0.4.0.7-1