X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=kp5-kscreenlocker.spec;h=37650fdfec24c752143c9b7dce5b082474603be2;hb=4451142225e4e8147ba5f8b85dfcf5e2094eb58e;hp=5387fdce74992bb4f1154ce9f430068c8a252dee;hpb=78dd94655f4d7de215472e91a3ce2425adec2a5f;p=packages%2Fkp5-kscreenlocker.git

diff --git a/kp5-kscreenlocker.spec b/kp5-kscreenlocker.spec
index 5387fdc..37650fd 100644
--- a/kp5-kscreenlocker.spec
+++ b/kp5-kscreenlocker.spec
@@ -1,16 +1,15 @@
-%define		kdeplasmaver	5.5.4
-%define		qtver		5.5.1
+%define		kdeplasmaver	5.22.2.1
+%define		qtver		5.9.0
 %define		kf5ver		5.19.0
 %define		kpname		kscreenlocker
-
 Summary:	kscreenlocker
 Name:		kp5-%{kpname}
-Version:	5.5.4
-Release:	2
+Version:	5.22.2.1
+Release:	1
 License:	LGPL v2.1+
 Group:		X11/Libraries
 Source0:	http://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
-# Source0-md5:	5073ee898dac459f53200daba96d73ba
+# Source0-md5:	9a0ef305af831c9834cc44471f968b03
 URL:		http://www.kde.org/
 BuildRequires:	Qt5Core-devel >= %{qtver}
 BuildRequires:	Qt5Gui-devel >= %{qtver}
@@ -28,8 +27,10 @@ BuildRequires:	kf5-kdeclarative-devel >= %{kf5ver}
 BuildRequires:	kf5-kdelibs4support-devel >= %{kf5ver}
 BuildRequires:	kf5-kglobalaccel-devel >= %{kf5ver}
 BuildRequires:	kf5-kidletime-devel >= %{kf5ver}
+BuildRequires:	kf5-kwayland-devel
 BuildRequires:	kf5-plasma-framework-devel >= %{kf5ver}
-BuildRequires:	kp5-kwayland-devel
+BuildRequires:	kp5-layer-shell-qt-devel >= %{kdeplasmaver}
+BuildRequires:	ninja
 BuildRequires:	rpmbuild(macros) >= 1.164
 BuildRequires:	xorg-lib-libX11-devel
 BuildRequires:	xz
@@ -59,16 +60,15 @@ Pliki nagłówkowe dla programistów używających %{kpname}.
 %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}5 --all-name --with-kde
 
@@ -81,20 +81,29 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{kpname}5.lang
 %defattr(644,root,root,755)
 %{_datadir}/kservices5/screenlocker.desktop
-%attr(755,root,root) %{_libdir}/kcheckpass
-%attr(755,root,root) %{_libdir}/kscreenlocker_greet
-%attr(755,root,root) %ghost %{_libdir}/libKScreenLocker.so.5
+%attr(755,root,root) %{_prefix}/libexec/kcheckpass
+%attr(755,root,root) %{_prefix}/libexec/kscreenlocker_greet
+%ghost %{_libdir}/libKScreenLocker.so.5
 %attr(755,root,root) %{_libdir}/libKScreenLocker.so.*.*
-%attr(755,root,root) %{_libdir}/qt5/plugins/screenlocker_kcm.so
 %{_datadir}/dbus-1/interfaces/kf5_org.freedesktop.ScreenSaver.xml
+%{_datadir}/dbus-1/interfaces/org.kde.screensaver.xml
 %{_datadir}/kconf_update/kscreenlocker.upd
-%{_datadir}/kconf_update/ksreenlocker_5_3_separate_autologin.pl
+%attr(755,root,root) %{_datadir}/kconf_update/ksreenlocker_5_3_separate_autologin.pl
 %{_datadir}/knotifications5/ksmserver.notifyrc
-%{_datadir}/kservices5/plasma-screenlocker_kcm-screenlocker_kcm.desktop
+%dir %{_datadir}/ksmserver
 %dir %{_datadir}/ksmserver/screenlocker
+%dir %{_datadir}/ksmserver/screenlocker/org.kde.passworddialog
 %{_datadir}/ksmserver/screenlocker/org.kde.passworddialog/metadata.desktop
-%{_datadir}/plasma/kcms/screenlocker_kcm/contents/ui/main.qml
-%{_datadir}/plasma/kcms/screenlocker_kcm/metadata.desktop
+%attr(755,root,root) %{_libdir}/qt5/plugins/kcms/kcm_screenlocker.so
+%dir %{_datadir}/kpackage/kcms/kcm_screenlocker
+%dir %{_datadir}/kpackage/kcms/kcm_screenlocker/contents
+%dir %{_datadir}/kpackage/kcms/kcm_screenlocker/contents/ui
+%{_datadir}/kpackage/kcms/kcm_screenlocker/contents/ui/Appearance.qml
+%{_datadir}/kpackage/kcms/kcm_screenlocker/contents/ui/LnfConfig.qml
+%{_datadir}/kpackage/kcms/kcm_screenlocker/contents/ui/WallpaperConfig.qml
+%{_datadir}/kpackage/kcms/kcm_screenlocker/contents/ui/main.qml
+%{_datadir}/kpackage/kcms/kcm_screenlocker/metadata.desktop
+%{_datadir}/kpackage/kcms/kcm_screenlocker/metadata.json
 
 %files devel
 %defattr(644,root,root,755)