rpms/qt6
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Adjust qt6_fix_tests macro to handle more cases

Browse Source 
Resolves: RHEL-28239
This commit is contained in:
Jan Grulich 2024-04-10 17:16:34 +02:00
parent 82b049b53a
commit 0d7ed59dbc
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
macros.qt6
View File

@ -64,18 +64,19 @@
-DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\ -DINSTALL_TRANSLATIONSDIR=%{_qt6_translationdir} \\\
-DQT_DISABLE_RPATH=TRUE -DQT_DISABLE_RPATH=TRUE
%qt6_fix_tests \ %qt6_fix_tests \
pushd tests/auto \ pushd tests/auto \
find . -type f -name 'CMakeLists.txt' \\\ find . -type f -name 'CMakeLists.txt' \\\
-exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}/\\\(.*\\\)|\\\1\\\2|' {} \\\; \ -exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}/\\\(.*\\\)|\\\1\\\2|' {} \\\; \\\
find . -type f \\\( -name '*.sh' -o -name '*.py' \\\) \\\ -exec sed -i 's|\\\(.*DIR="*\\\)${CMAKE_CURRENT_SOURCE_DIR}\\\(.*\\\)|\\\1.\\\2|' {} \\\; \
-exec sed -i 's|/usr/bin/python$|/usr/bin/python3|' {} \\\; \\\ find . -type f \\\( -name '*.sh' -o -name '*.py' \\\) \\\
-exec sed -i 's|/usr/bin/env\\\ python3*|/usr/bin/python3|' {} \\\; \\\ -exec sed -i 's|/usr/bin/python$|/usr/bin/python3|' {} \\\; \\\
-exec sed -i 's|^/bin/sh$|!#/bin/sh|' {} \\\; \ -exec sed -i 's|/usr/bin/env\\\ python3*|/usr/bin/python3|' {} \\\; \\\
popd \ -exec sed -i 's|^/bin/sh$|!#/bin/sh|' {} \\\; \
popd \
%qt6_dont_autoinstall_tests \ %qt6_dont_autoinstall_tests \
sed -i 's|include(".*tests/cmake_install.cmake")||' %_vpath_srcdir/%_vpath_builddir/cmake_install.cmake \ sed -i 's|include(".*tests/cmake_install.cmake")||' %_vpath_srcdir/%_vpath_builddir/cmake_install.cmake \
%qt6_install_tests \ %qt6_install_tests \
mkdir -p %{buildroot}%{_qt6_archdatadir}/tests \ mkdir -p %{buildroot}%{_qt6_archdatadir}/tests \

6
qt6.spec
View File

@ -1,7 +1,7 @@
Name: qt6 Name: qt6
Version: 6.6.1 Version: 6.6.1
Release: 7%{?dist} Release: 8%{?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/
@ -149,6 +149,10 @@ echo "- Qt6 devel meta package" > %{buildroot}%{_docdir}/qt6-devel/README
%changelog %changelog
* Wed Apr 10 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-8
- Adjust qt6_fix_tests macro to handle more cases
Resolves: RHEL-28239
* Tue Apr 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-7 * Tue Apr 09 2024 Jan Grulich <jgrulich@redhat.com> - 6.6.1-7
- Replace patchelf with chrpath - Replace patchelf with chrpath
Resolves: RHEL-28239 Resolves: RHEL-28239