- updated to 5.109.0; cmake -B build

[packages/kf5-kwidgetsaddons.git] / kf5-kwidgetsaddons.spec

diff --git a/kf5-kwidgetsaddons.spec b/kf5-kwidgetsaddons.spec
index eeedb4525774b8a7618f69bda3e503cdb3cdf0cc..5dbfe88061cf3ccc63618e833c6c0365dccfc250 100644 (file)
--- a/kf5-kwidgetsaddons.spec
+++ b/kf5-kwidgetsaddons.spec
@@ -1,20 +1,25 @@
-%define                kdeframever     5.84
-%define                qtver           5.14.0
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+%define                kdeframever     5.109
+%define                qtver           5.15.2
 %define                kfname          kwidgetsaddons
 
 Summary:       Large set of desktop widgets
 Name:          kf5-%{kfname}
-Version:       5.84.0
+Version:       5.109.0
 Release:       1
 License:       LGPL v2.1+
 Group:         X11/Libraries
-Source0:       http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5: 439b6adfcb260c3bc7f0eac452a86cfd
+Source0:       https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5: 67f4605da5e119342e91fc4670114a2b
 Patch0:                failed-tests.patch
 URL:           http://www.kde.org/
+BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Test-devel >= %{qtver}
+BuildRequires: Qt5UiTools-devel >= %{qtver}
 BuildRequires: Qt5Widgets-devel >= %{qtver}
-BuildRequires: cmake >= 3.5
+BuildRequires: cmake >= 3.16
 BuildRequires: kf5-extra-cmake-modules >= %{version}
 BuildRequires: ninja
 BuildRequires: qt5-linguist >= %{qtver}
@@ -49,7 +54,7 @@ Summary(pl.UTF-8):    Pliki nagłówkowe dla programistów używających %{kfname}
 Group:         X11/Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 Requires:      Qt5Widgets-devel >= %{qtver}
-Requires:      cmake >= 3.5
+Requires:      cmake >= 3.16
 
 %description devel
 Header files for %{kfname} development.
@@ -62,12 +67,17 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 #%%patch0 -p1
 
 %build
-install -d build
-cd build
-%cmake -G Ninja \
-       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
-       ../
-%ninja_build
+%cmake -B build \
+       -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
+       -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
+
+%ninja_build -C build
+
+%if %{with tests}
+%ninja_build -C build test
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -94,7 +104,6 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/KWidgetsAddons
-%{_includedir}/KF5/kwidgetsaddons_version.h
 %{_libdir}/cmake/KF5WidgetsAddons
 %{_libdir}/libKF5WidgetsAddons.so
 %{qt5dir}/mkspecs/modules/qt_KWidgetsAddons.pri