X-Git-Url: http://git.pld-linux.org/?p=packages%2Fkp5-kde-cli-tools.git;a=blobdiff_plain;f=kp5-kde-cli-tools.spec;h=9f669f6f52a9ddd368ca39d7b6114410fc6d4a36;hp=727c0bc7bc57cb1e0ba232610496f081d3f68e92;hb=e74ae1e;hpb=1b47ceb5349b30d26edab50b334da6f4fddeadf8

diff --git a/kp5-kde-cli-tools.spec b/kp5-kde-cli-tools.spec
index 727c0bc..9f669f6 100644
--- a/kp5-kde-cli-tools.spec
+++ b/kp5-kde-cli-tools.spec
@@ -1,14 +1,14 @@
-%define		kdeplasmaver	5.14.5
+%define		kdeplasmaver	5.21.5
 %define		qtver		5.9.0
 %define		kpname		kde-cli-tools
 Summary:	Tools based on KDE Frameworks 5 to better interact with the system
 Name:		kp5-%{kpname}
-Version:	5.14.5
+Version:	5.21.5
 Release:	1
 License:	GPL v2+/LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5:	be9fe02e19e8e815b9b50b05b25faf0e
+# Source0-md5:	cfe0ca043ad2fbaeaa1213d92b6f3b92
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
@@ -22,7 +22,8 @@ BuildRequires:	kf5-ki18n-devel
 BuildRequires:	kf5-kiconthemes-devel
 BuildRequires:	kf5-kitemmodels-devel
 BuildRequires:	kf5-kwindowsystem-devel
-BuildRequires:	kp5-plasma-workspace-devel >= 5.14.5
+BuildRequires:	kp5-plasma-workspace-devel >= %{version}
+BuildRequires:	ninja
 BuildRequires:	qt5-build >= %{qtver}
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	tar >= 1:1.22
@@ -38,15 +39,16 @@ Tools based on KDE Frameworks 5 to better interact with the system.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
 	-DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+	-DHTML_INSTALL_DIR=%{_kdedocdir} \
 	..
-%{__make}
+%ninja_build
 
 %install
 rm -rf $RPM_BUILD_ROOT
-%{__make} -C build install \
-	DESTDIR=$RPM_BUILD_ROOT
+%ninja_install -C build
+rm -rf $RPM_BUILD_ROOT%{_kdedocdir}/{sr,sr@latin}
 
 %find_lang kde-cli-tools --all-name --with-kde
 
@@ -71,20 +73,22 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/ktraderclient5
 %attr(755,root,root) %{_libexecdir}/kf5/kdeeject
 %attr(755,root,root) %{_libexecdir}/kf5/kdesu
-%attr(755,root,root) %{_libdir}/libkdeinit5_kcmshell5.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_filetypes.so
 %{_datadir}/kservices5/filetypes.desktop
 %{_mandir}/man1/kdesu.1*
-%lang(ca) /usr/share/man/ca/man1/kdesu.1*
-%lang(de) /usr/share/man/de/man1/kdesu.1*
-%lang(es) /usr/share/man/es/man1/kdesu.1*
-%lang(et) /usr/share/man/et/man1/kdesu.1*
-%lang(it) /usr/share/man/it/man1/kdesu.1*
-%lang(nb) /usr/share/man/nb/man1/kdesu.1*
-%lang(nl) /usr/share/man/nl/man1/kdesu.1*
-%lang(pt) /usr/share/man/pt/man1/kdesu.1*
-%lang(pt_BR) /usr/share/man/pt_BR/man1/kdesu.1*
-%lang(ru) /usr/share/man/ru/man1/kdesu.1*
-%lang(sr) /usr/share/man/sr/man1/kdesu.1*
-%lang(sv) /usr/share/man/sv/man1/kdesu.1*
-%lang(uk) /usr/share/man/uk/man1/kdesu.1*
+%lang(ca) %{_mandir}/ca/man1/kdesu.1*
+%lang(de) %{_mandir}/de/man1/kdesu.1*
+%lang(es) %{_mandir}/es/man1/kdesu.1*
+%lang(et) %{_mandir}/et/man1/kdesu.1*
+%lang(it) %{_mandir}/it/man1/kdesu.1*
+%lang(nb) %{_mandir}/nb/man1/kdesu.1*
+%lang(nl) %{_mandir}/nl/man1/kdesu.1*
+%lang(pt) %{_mandir}/pt/man1/kdesu.1*
+%lang(pt_BR) %{_mandir}/pt_BR/man1/kdesu.1*
+%lang(ru) %{_mandir}/ru/man1/kdesu.1*
+%lang(sr) %{_mandir}/sr/man1/kdesu.1*
+%lang(sv) %{_mandir}/sv/man1/kdesu.1*
+%lang(uk) %{_mandir}/uk/man1/kdesu.1*
+%{_desktopdir}/org.kde.keditfiletype.desktop
+%attr(755,root,root) %{_bindir}/kde-inhibit
+%lang(fr) %{_mandir}/fr/man1/kdesu.1*