X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kp5-powerdevil.spec;h=d1786c3828efd72b9a6d9d8d572695c46bee415e;hb=2b835aa;hp=b0d8fbcfbe4b441ace37d43e94c027309cbd5e75;hpb=218fcf7dc2d243fb8cd93dfc5de753f02c115f60;p=packages%2Fkp5-powerdevil.git

diff --git a/kp5-powerdevil.spec b/kp5-powerdevil.spec
index b0d8fbc..d1786c3 100644
--- a/kp5-powerdevil.spec
+++ b/kp5-powerdevil.spec
@@ -1,20 +1,19 @@
-%define		kdeplasmaver	5.14.5
+%define		kdeplasmaver	5.22.0
 %define		qtver		5.9.0
 %define		kpname		powerdevil
 
 Summary:	Manages the power consumption settings of a Plasma Shell
 Name:		kp5-%{kpname}
-Version:	5.14.5
+Version:	5.22.0
 Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5:	85cb6af97de3c5867aae2f5fb2a058a2
+# Source0-md5:	6aa3746f152297d7e0a6c8e606169fb7
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	cmake >= 2.8.12
 BuildRequires:	kf5-bluez-qt-devel
-BuildRequires:	kf5-networkmanager-qt-devel
 BuildRequires:	kf5-kactivities-devel
 BuildRequires:	kf5-kauth-devel
 BuildRequires:	kf5-kconfig-devel
@@ -25,11 +24,13 @@ BuildRequires:	kf5-ki18n-devel
 BuildRequires:	kf5-kidletime-devel
 BuildRequires:	kf5-kio-devel
 BuildRequires:	kf5-knotifyconfig-devel
-BuildRequires:	kf5-solid-devel
 BuildRequires:	kf5-kwayland-devel
+BuildRequires:	kf5-networkmanager-qt-devel
+BuildRequires:	kf5-solid-devel
 BuildRequires:	kp5-libkscreen-devel
-BuildRequires:	kp5-plasma-workspace-devel
+BuildRequires:	kp5-plasma-workspace-devel >= %{kdeplasmaver}
 BuildRequires:	libxcb-devel
+BuildRequires:	ninja
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	xz
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -45,16 +46,15 @@ Manages the power consumption settings of a Plasma Shell.
 %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
 
 %find_lang %{kpname} --all-name --with-kde
 
@@ -66,23 +66,20 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{kpname}.lang
 %defattr(644,root,root,755)
-/etc/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
 %attr(755,root,root) %{_libexecdir}/org_kde_powerdevil
 %attr(755,root,root) %{_libexecdir}/kauth/backlighthelper
 %attr(755,root,root) %{_libexecdir}/kauth/discretegpuhelper
-%attr(755,root,root) %ghost %{_libdir}/libpowerdevilconfigcommonprivate.so.5
+%ghost %{_libdir}/libpowerdevilconfigcommonprivate.so.5
 %attr(755,root,root) %{_libdir}/libpowerdevilconfigcommonprivate.so.*.*.*
-%attr(755,root,root) %ghost  %{_libdir}/libpowerdevilcore.so.2
+%ghost  %{_libdir}/libpowerdevilcore.so.2
 %attr(755,root,root) %{_libdir}/libpowerdevilcore.so.*.*.*
-%attr(755,root,root) %ghost  %{_libdir}/libpowerdevilui.so.5
+%ghost  %{_libdir}/libpowerdevilui.so.5
 %attr(755,root,root) %{_libdir}/libpowerdevilui.so.*.*.*
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_powerdevilactivitiesconfig.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_powerdevilglobalconfig.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/kcm_powerdevilprofilesconfig.so
-#%attr(755,root,root) %{_libdir}/qt5/plugins/kded_powerdevil.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevilbrightnesscontrolaction_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevildimdisplayaction_config.so
-%attr(755,root,root) %{_libdir}/qt5/plugins/powerdevildpmsaction.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevildpmsaction_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevilhandlebuttoneventsaction_config.so
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevilkeyboardbrightnesscontrolaction_config.so
@@ -90,12 +87,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/qt5/plugins/powerdevilsuspendsessionaction_config.so
 %{_datadir}/dbus-1/system-services/org.kde.powerdevil.backlighthelper.service
 %{_datadir}/knotifications5/powerdevil.notifyrc
-#%{_datadir}/kservices5/kded/powerdevil.desktop
 %{_datadir}/kservices5/powerdevil*.desktop
 %{_datadir}/kservicetypes5/powerdevilaction.desktop
 %{_datadir}/polkit-1/actions/org.kde.powerdevil.backlighthelper.policy
-
-/etc/dbus-1/system.d/org.kde.powerdevil.discretegpuhelper.conf
 /etc/xdg/autostart/powerdevil.desktop
 %{_libdir}/libpowerdevilconfigcommonprivate.so
 %{_libdir}/libpowerdevilcore.so
@@ -105,3 +99,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/qt5/plugins/powerdevilwirelesspowersavingaction_config.so
 %{_datadir}/dbus-1/system-services/org.kde.powerdevil.discretegpuhelper.service
 %{_datadir}/polkit-1/actions/org.kde.powerdevil.discretegpuhelper.policy
+%{_datadir}/dbus-1/system.d/org.kde.powerdevil.backlighthelper.conf
+%{_datadir}/dbus-1/system.d/org.kde.powerdevil.discretegpuhelper.conf
+%{systemduserunitdir}/plasma-powerdevil.service
+%attr(755,root,root) %{_prefix}/libexec/kauth/chargethresholdhelper
+%{_datadir}/dbus-1/system-services/org.kde.powerdevil.chargethresholdhelper.service
+%{_datadir}/dbus-1/system.d/org.kde.powerdevil.chargethresholdhelper.conf
+%{_datadir}/polkit-1/actions/org.kde.powerdevil.chargethresholdhelper.policy
+%{_datadir}/qlogging-categories5/powerdevil.categories