From f303e46301fe7cf65d9768152f591165ce8e78ad Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 27 Mar 2024 12:49:55 +0100 Subject: [PATCH] Add -tests subpackage with unit tests that can run in CI Resolves: RHEL-28239 --- qt6-qtconnectivity.spec | 36 ++++++++++++++++++++++++++++++++++-- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/qt6-qtconnectivity.spec b/qt6-qtconnectivity.spec index 04cfecf..61b4f77 100644 --- a/qt6-qtconnectivity.spec +++ b/qt6-qtconnectivity.spec @@ -7,11 +7,13 @@ %endif %global examples 1 +# FIXME: needs bootstrap +%global build_tests 1 Summary: Qt6 - Connectivity components Name: qt6-%{qt_module} Version: 6.6.1 -Release: 3%{?dist} +Release: 4%{?dist} # See LICENSE.GPL3, respectively, for exception details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 @@ -58,19 +60,39 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{summary}. %endif +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +BuildRequires: qt6-qtconnectivity-devel >= %{version} +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +%{summary}. +%endif + %prep %autosetup -n %{qt_module}-everywhere-src-%{qt_version}%{?unstable:-%{prerelease}} -p1 %build -%cmake_qt6 -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} +%cmake_qt6 \ + -DQT_BUILD_EXAMPLES:BOOL=%{?examples:ON}%{!?examples:OFF} \ + -DQT_BUILD_TESTS=%{?build_tests:ON}%{!?build_tests:OFF} %cmake_build %install +%if 0%{?build_tests} +%qt6_dont_autoinstall_tests +%endif + %cmake_install +%if 0%{?build_tests} +%qt6_install_tests +%endif + ## .prl/.la file love # nuke .prl reference(s) to %%buildroot, excessive (.la-like) libs pushd %{buildroot}%{_qt6_libdir} @@ -117,7 +139,17 @@ popd %{_qt6_examplesdir}/ %endif +%if 0%{?build_tests} +%files tests +%{_qt6_archdatadir}/tests +%endif + + %changelog +* Wed Mar 27 2024 Jan Grulich - 6.6.1-4 +- Add -tests subpackage with unit tests that can run in CI + Resolves: RHEL-28239 + * Fri Jan 26 2024 Fedora Release Engineering - 6.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild