X-Git-Url: https://git.pld-linux.org/?p=packages%2Fkf5-kactivities.git;a=blobdiff_plain;f=kf5-kactivities.spec;h=dcefa148dc944ba232fb49b8bd09361563cac81d;hp=e4792cc6366d6059307a88f4f821c8b58d3ab525;hb=fe0b3e3;hpb=61aba0d76fef49058b6db269a3404a64f05f62ca

diff --git a/kf5-kactivities.spec b/kf5-kactivities.spec
index e4792cc..dcefa14 100644
--- a/kf5-kactivities.spec
+++ b/kf5-kactivities.spec
@@ -1,17 +1,17 @@
 # TODO:
 # Conflict /usr/bin/kactivitymanagerd
-%define		kdeframever	5.53
+%define		kdeframever	5.80
 %define		qtver		5.9.0
 %define		kfname		kactivities
 
 Summary:	Core components for the KDE's Activities Activity Manager
 Name:		kf5-%{kfname}
-Version:	5.53.0
+Version:	5.80.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://download.kde.org/stable/frameworks/%{kdeframever}/%{kfname}-%{version}.tar.xz
-# Source0-md5:	c05f22156c27da1ad2f7d2d07026b2e8
+# Source0-md5:	5ef03a7f96c9fe84eaf417c5fc55570c
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5DBus-devel >= %{qtver}
@@ -26,7 +26,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 +51,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 +85,14 @@ Pliki nagłówkowe dla programistów używających %{kfname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
 	../
-%{__make}
+%ninja_build
 
 %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,32 +103,20 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc README.md
-/etc/xdg/kactivities.categories
+%{_datadir}/qlogging-categories5/kactivities.categories
 %attr(755,root,root) %{_bindir}/kactivities-cli
-%attr(755,root,root) %ghost %{_libdir}/libKF5Activities.so.5
+%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