From cc41f233ff88907fe77d1b9f57e0dff902c68e35 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-45217 --- java-21-openjdk.spec | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/java-21-openjdk.spec b/java-21-openjdk.spec index 657df1b..c2bd2c5 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 @@ -1432,6 +1438,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 @@ -2487,6 +2497,7 @@ cjc.mainProgram(args) %changelog * Fri Apr 12 2024 Andrew Hughes - 1:21.0.2.0.13-2 - Define portablesuffix according to whether pkgos is defined or not +- Handle debugedit being a separate package installed in /usr on RHEL/CentOS 10 - Related: RHEL-45217 * Tue Jan 09 2024 Andrew Hughes - 1:21.0.2.0.13-1