From aece78a5de9a2d0e3fdd3e4ca8505f5cd5dec6b8 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Mon, 9 Dec 2024 15:10:58 +0100 Subject: [PATCH] Re-enable tests Resolves: RHEL-53982 --- qt6-qtpositioning.spec | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/qt6-qtpositioning.spec b/qt6-qtpositioning.spec index bf49411..73fb5f5 100644 --- a/qt6-qtpositioning.spec +++ b/qt6-qtpositioning.spec @@ -8,12 +8,12 @@ %global examples 1 # FIXME: needs bootstrap -#global build_tests 1 +%global build_tests 1 Summary: Qt6 - Positioning component Name: qt6-%{qt_module} Version: 6.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -109,6 +109,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %qt6_dont_autoinstall_tests %endif +%if 0%{?build_tests} +# FIXME: avoid SBOM for test plugins +sed -i -e 's@.*qt_sbom/SPDXRef-Package-qtpositioning-qt-plugin-QGeoPositionInfoSourceFactoryTestPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-QGeoPositionInfoSourceFactoryTestPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-Package-qtpositioning-qt-plugin-DummyPluginForTestsFactoryPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-DummyPluginForTestsFactoryPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-Package-qtpositioning-qt-plugin-QGeoSatelliteInfoSourceTestPlugin.cmake")@@' \ + -e 's@.*qt_sbom/SPDXRef-PackagedFile-qt-plugin-QGeoSatelliteInfoSourceTestPlugin.cmake")@@' \ + %_vpath_srcdir/%_vpath_builddir/qt_sbom/assemble_sbom.cmake +%endif + %cmake_install %if 0%{?build_tests} @@ -170,6 +181,10 @@ popd %endif %changelog +* Mon Dec 09 2024 Jan Grulich - 6.8.1-2 +- Re-enable tests + Resolves: RHEL-53982 + * Fri Dec 06 2024 Jan Grulich - 6.8.1-1 - 6.8.1 Resolves: RHEL-53982