From ac93f490755440d9029255e8eddba5f59a83a437 Mon Sep 17 00:00:00 2001 From: Jan Grulich Date: Wed, 27 Mar 2024 12:18:26 +0100 Subject: [PATCH] Add -tests subpackage with unit tests that can run in CI Resolves: RHEL-28239 --- qt6-qt5compat.spec | 34 ++++++++++++++++++++++++++++++++-- 1 file changed, 32 insertions(+), 2 deletions(-) diff --git a/qt6-qt5compat.spec b/qt6-qt5compat.spec index ee116f7..b480144 100644 --- a/qt6-qt5compat.spec +++ b/qt6-qt5compat.spec @@ -8,10 +8,13 @@ %global prerelease rc2 %endif +%global examples 1 +%global build_tests 1 + Summary: Qt6 - Qt 5 Compatibility Libraries Name: qt6-%{qt_module} Version: 6.6.1 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 Url: http://www.qt.io @@ -58,20 +61,38 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %{summary}. %endif +%if 0%{?build_tests} +%package tests +Summary: Unit tests for %{name} +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 @@ -112,7 +133,16 @@ popd %{_qt6_examplesdir}/ %endif +%if 0%{?build_tests} +%files tests +%{_qt6_archdatadir}/tests +%endif + %changelog +* Wed Mar 27 2024 Jan Grulich - 6.6.1-5 +- Add -tests subpackage with unit tests that can run in CI + Resolves: RHEL-28239 + * Wed Jan 31 2024 Pete Walter - 6.6.1-4 - Rebuild for ICU 74