X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kf5-threadweaver.spec;h=95248e58356b00fe629857350e107f55cea98ab6;hb=HEAD;hp=8655b7800f74bbb4adca60b998566ecd599871d9;hpb=ed6c20a1b19ef92cabc21006c39bf0449760766d;p=packages%2Fkf5-threadweaver.git

diff --git a/kf5-threadweaver.spec b/kf5-threadweaver.spec
index 8655b78..8898009 100644
--- a/kf5-threadweaver.spec
+++ b/kf5-threadweaver.spec
@@ -1,20 +1,23 @@
-%define		kdeframever	5.67
-%define		qtver		5.9.0
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
+%define		kdeframever	5.116
+%define		qtver		5.15.2
 %define		kfname		threadweaver
 
 Summary:	Helper for multithreaded programming
 Name:		kf5-%{kfname}
-Version:	5.67.0
+Version:	5.116.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	8ee447185a4e603cc409ee4218cee195
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	124e8d40ffcde3a3308c0b5c3af47193
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Test-devel >= %{qtver}
-BuildRequires:	cmake >= 2.8.12
-BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
+BuildRequires:	cmake >= 3.16
+BuildRequires:	kf5-extra-cmake-modules >= %{version}
 BuildRequires:	ninja
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	tar >= 1:1.22
@@ -54,12 +57,17 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %setup -q -n %{kfname}-%{version}
 
 %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
@@ -74,13 +82,12 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %ghost %{_libdir}/libKF5ThreadWeaver.so.5
+%ghost %{_libdir}/libKF5ThreadWeaver.so.5
 %attr(755,root,root) %{_libdir}/libKF5ThreadWeaver.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/ThreadWeaver
-%{_includedir}/KF5/threadweaver_version.h
 %{_libdir}/cmake/KF5ThreadWeaver
 %{_libdir}/libKF5ThreadWeaver.so
 %{qt5dir}/mkspecs/modules/qt_ThreadWeaver.pri