X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kf5-kactivities.spec;h=8fb2a313f91daa5f838ec00a68a196f310f412b0;hb=708bcfa524a8b56e7cfa2026238e5ec9c177aef0;hp=b09167d72d147f21cf055fbc17614e32534d00b6;hpb=96dae5b788f1579a57178d1a2b69a3886e117d63;p=packages%2Fkf5-kactivities.git

diff --git a/kf5-kactivities.spec b/kf5-kactivities.spec
index b09167d..8fb2a31 100644
--- a/kf5-kactivities.spec
+++ b/kf5-kactivities.spec
@@ -1,17 +1,20 @@
+#
+# Conditional build:
+%bcond_with	tests		# build with tests
 # TODO:
 # Conflict /usr/bin/kactivitymanagerd
-%define		kdeframever	5.24
-%define		qtver		5.3.2
+%define		kdeframever	5.100
+%define		qtver		5.15.2
 %define		kfname		kactivities
 
 Summary:	Core components for the KDE's Activities Activity Manager
 Name:		kf5-%{kfname}
-Version:	5.24.0
+Version:	5.100.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
-Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	7f65f22f0ff0e118b2138186d8160ea2
+Source0:	https://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
+# Source0-md5:	15cc330c6e6ab83c3bca2b7ef8227fc3
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
@@ -26,7 +29,7 @@ BuildRequires:	boost-devel
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	gettext-devel
 BuildRequires:	kf5-attica-devel >= %{version}
-BuildRequires:	kf5-extra-cmake-modules >= 1.4.0
+BuildRequires:	kf5-extra-cmake-modules >= %{version}
 BuildRequires:	kf5-kauth-devel >= %{version}
 BuildRequires:	kf5-kbookmarks-devel >= %{version}
 BuildRequires:	kf5-kcmutils-devel >= %{version}
@@ -51,6 +54,7 @@ BuildRequires:	kf5-kwindowsystem-devel >= %{version}
 BuildRequires:	kf5-kxmlgui-devel >= %{version}
 BuildRequires:	kf5-solid-devel >= %{version}
 BuildRequires:	kf5-sonnet-devel >= %{version}
+BuildRequires:	ninja
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	tar >= 1:1.22
 BuildRequires:	xz
@@ -84,16 +88,20 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+	%{!?with_tests:-DBUILD_TESTING=OFF} \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
-%{__make}
+%ninja_build
+
+%if %{with tests}
+ctest
+%endif
+
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-%{__make} -C build/ install \
-        DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -104,30 +112,19 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md
-%attr(755,root,root) %ghost %{_libdir}/libKF5Activities.so.5
+%{_datadir}/qlogging-categories5/kactivities.categories
+%attr(755,root,root) %{_bindir}/kactivities-cli
+%ghost %{_libdir}/libKF5Activities.so.5
 %attr(755,root,root) %{_libdir}/libKF5Activities.so.*.*
 %dir %{qt5dir}/qml/org/kde/activities
 %{qt5dir}/qml/org/kde/activities/qmldir
-
-#%%attr(755,root,root) %{qt5dir}/qml/org/kde/activities/settings/libkactivitiessettingsplugin.so
-#%%{qt5dir}/qml/org/kde/activities/settings/qmldir
 %attr(755,root,root) %{qt5dir}/qml/org/kde/activities/libkactivitiesextensionplugin.so
-
-#%%{_datadir}/kf5/kactivitymanagerd/workspace/settings/BlacklistApplicationView.qml
-#%%{_datadir}/kservices5/activities.protocol
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-activitytemplates.desktop
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-eventspy.desktop
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-globalshortcuts.desktop
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-slc.desktop
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-sqlite.desktop
-#%{_datadir}/kservices5/kactivitymanagerd-plugin-virtualdesktopswitch.desktop
-#%%{_datadir}/kservices5/kcm_activities.desktop
+%{_datadir}/qlogging-categories5/kactivities.renamecategories
 
 %files devel
 %defattr(644,root,root,755)
 %{_includedir}/KF5/KActivities
-%{_includedir}/KF5/kactivities_version.h
 %{_libdir}/cmake/KF5Activities
-%attr(755,root,root) %{_libdir}/libKF5Activities.so
+%{_libdir}/libKF5Activities.so
 %{_pkgconfigdir}/libKActivities.pc
 %{qt5dir}/mkspecs/modules/qt_KActivities.pri