From 82b049b53a93f22afc82dd1c41a05fefd25853a8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Tue, 9 Apr 2024 15:49:28 +0200 Subject: [PATCH] Replace patchelf with chrpath Resolves: RHEL-28239 --- macros.qt6 | 2 +- qt6.spec | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/macros.qt6 b/macros.qt6 index bc56784..cce9fc7 100644 --- a/macros.qt6 +++ b/macros.qt6 @@ -89,6 +89,6 @@ popd \ pushd %_vpath_srcdir/%_vpath_builddir/tests/auto \ find . -type f -executable \\\ - -exec patchelf --remove-rpath {} \\\; \\\ + -exec chrpath --delete {} \\\; \\\ -exec cp -r --parents {} %{buildroot}%{_qt6_archdatadir}/tests \\\; \ popd \ diff --git a/qt6.spec b/qt6.spec index 65d5835..f13fde8 100644 --- a/qt6.spec +++ b/qt6.spec @@ -1,7 +1,7 @@ Name: qt6 Version: 6.6.1 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Qt6 meta package License: GPL-3.0-only URL: https://getfedora.org/ @@ -91,7 +91,7 @@ Requires: qt6-rpm-macros Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages Requires: cmake >= 3 Requires: gcc-c++ -Requires: patchelf +Requires: chrpath %description rpm-macros %{summary}. @@ -149,6 +149,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README %changelog +* Tue Apr 09 2024 Jan Grulich - 6.6.1-7 +- Replace patchelf with chrpath + Resolves: RHEL-28239 + * Wed Mar 27 2024 Jan Grulich - 6.6.1-6 - Add macros to build and fix Qt unit tests Resolves: RHEL-28239