Replace patchelf with chrpath

Resolves: RHEL-28239
This commit is contained in:
Jan Grulich 2024-04-09 15:49:28 +02:00
parent f33f31987f
commit 82b049b53a
2 changed files with 7 additions and 3 deletions

View File

@ -89,6 +89,6 @@
popd \ popd \
pushd %_vpath_srcdir/%_vpath_builddir/tests/auto \ pushd %_vpath_srcdir/%_vpath_builddir/tests/auto \
find . -type f -executable \\\ find . -type f -executable \\\
-exec patchelf --remove-rpath {} \\\; \\\ -exec chrpath --delete {} \\\; \\\
-exec cp -r --parents {} %{buildroot}%{_qt6_archdatadir}/tests \\\; \ -exec cp -r --parents {} %{buildroot}%{_qt6_archdatadir}/tests \\\; \
popd \ popd \

View File

@ -1,7 +1,7 @@
Name: qt6 Name: qt6
Version: 6.6.1 Version: 6.6.1
Release: 6%{?dist} Release: 7%{?dist}
Summary: Qt6 meta package Summary: Qt6 meta package
License: GPL-3.0-only License: GPL-3.0-only
URL: https://getfedora.org/ URL: https://getfedora.org/
@ -91,7 +91,7 @@ Requires: qt6-rpm-macros
Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages Summary: RPM macros for building Qt6 and KDE Frameworks 5 packages
Requires: cmake >= 3 Requires: cmake >= 3
Requires: gcc-c++ Requires: gcc-c++
Requires: patchelf Requires: chrpath
%description rpm-macros %description rpm-macros
%{summary}. %{summary}.
@ -149,6 +149,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
%changelog %changelog
* Tue Apr 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-7
- Replace patchelf with chrpath
Resolves: RHEL-28239
* Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-6 * Wed Mar 27 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-6
- Add macros to build and fix Qt unit tests - Add macros to build and fix Qt unit tests
Resolves: RHEL-28239 Resolves: RHEL-28239