- updated to 5.25.3

[packages/kp5-kscreenlocker.git] / kp5-kscreenlocker.spec

diff --git a/kp5-kscreenlocker.spec b/kp5-kscreenlocker.spec
index 5387fdce74992bb4f1154ce9f430068c8a252dee..87d4f855ee99df6f29a3a9fa8781cf96d567bccd 100644 (file)
--- a/kp5-kscreenlocker.spec
+++ b/kp5-kscreenlocker.spec
@@ -1,16 +1,18 @@
-%define                kdeplasmaver    5.5.4
-%define                qtver           5.5.1
+#
+# Conditional build:
+%bcond_with    tests           # build with tests
+%define                kdeplasmaver    5.25.3
+%define                qtver           5.15.2
 %define                kf5ver          5.19.0
 %define                kpname          kscreenlocker
-
 Summary:       kscreenlocker
 Name:          kp5-%{kpname}
-Version:       5.5.4
-Release:       2
+Version:       5.25.3
+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:       https://download.kde.org/stable/plasma/%{kdeplasmaver}/%{kpname}-%{version}.tar.xz
+# Source0-md5: 327e33eacce1fae00bd5d1b12c9e3a93
 URL:           http://www.kde.org/
 BuildRequires: Qt5Core-devel >= %{qtver}
 BuildRequires: Qt5Gui-devel >= %{qtver}
@@ -28,9 +30,13 @@ 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: pam-devel
 BuildRequires: rpmbuild(macros) >= 1.164
+BuildRequires: xcb-util-keysyms-devel
 BuildRequires: xorg-lib-libX11-devel
 BuildRequires: xz
 BuildRequires: zlib-devel
@@ -59,16 +65,20 @@ Pliki nagłówkowe dla programistów używających %{kpname}.
 %build
 install -d build
 cd build
-%cmake \
+%cmake -G Ninja \
+       %{!?with_tests:-DBUILD_TESTING=OFF} \
        -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+       -DHTML_INSTALL_DIR=%{_kdedocdir} \
        ../
-%{__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
 
 %find_lang %{kpname}5 --all-name --with-kde
 
@@ -80,21 +90,27 @@ 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/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
+%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
+%{_libdir}/qt5/plugins/plasma/kcms/systemsettings/kcm_screenlocker.so
+%{_desktopdir}/kcm_screenlocker.desktop
 
 %files devel
 %defattr(644,root,root,755)