diff --git a/fix-wayland-version-requirement.diff b/fix-wayland-version-requirement.diff deleted file mode 100644 index 8a86b95..0000000 --- a/fix-wayland-version-requirement.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: kscreenlocker-5.5.0/CMakeLists.txt -=================================================================== ---- kscreenlocker-5.5.0.orig/CMakeLists.txt -+++ kscreenlocker-5.5.0/CMakeLists.txt -@@ -56,7 +56,7 @@ set_package_properties(KF5Wayland PROPERTIES - TYPE REQUIRED - PURPOSE "Required for building screenlocker") - find_package(WaylandScanner) --find_package(Wayland 1.3 COMPONENTS Client Server) -+find_package(Wayland 1.2.1 COMPONENTS Client Server) - - set_package_properties(Wayland PROPERTIES - TYPE REQUIRED diff --git a/kscreenlocker b/kscreenlocker new file mode 100644 index 0000000..6dcaffa --- /dev/null +++ b/kscreenlocker @@ -0,0 +1,6 @@ +#%PAM-1.0 +auth include common-auth +account include common-account +password include common-password +session required pam_loginuid.so +session include common-session diff --git a/kscreenlocker.changes b/kscreenlocker.changes index b9efcbb..c8de88e 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sat Sep 29 08:13:06 UTC 2018 - fabian@ritter-vogt.de + +- Ship a copy of the xdm PAM file to not depend on a display manager + being installed (boo#1108329) +- Drop fix-wayland-version-requirement.diff, not needed anymore + ------------------------------------------------------------------- Sat Sep 15 16:25:28 UTC 2018 - fabian@ritter-vogt.de diff --git a/kscreenlocker.spec b/kscreenlocker.spec index ccf4913..22cadc2 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -29,8 +29,7 @@ Source: http://download.kde.org/unstable/plasma/%{version}/kscreenlocker Source1: http://download.kde.org/unstable/plasma/%{version}/kscreenlocker-%{version}.tar.xz.sig Source2: plasma.keyring %endif -# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 -Patch0: fix-wayland-version-requirement.diff +Source3: kscreenlocker BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -61,6 +60,7 @@ BuildRequires: pkgconfig(xcb) BuildRequires: pkgconfig(xcb-keysyms) BuildRequires: pkgconfig(xcursor) BuildRequires: pkgconfig(xi) +Requires: pam-config Requires(post): pam-config Requires(post): /usr/bin/killall Recommends: %{name}-lang @@ -88,16 +88,14 @@ Development files for Library and components for secure lock screen architecture %lang_package %prep %setup -q -n %{name}-%{version} -%if 0%{?suse_version} == 1315 && !0%{?is_opensuse} -# SLE12 has a patched 1.2.1 wayland with all features KDE needs from up to 1.7.0 -%patch0 -p1 -%endif %build - %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=xdm -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} + %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=kscreenlocker -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} %make_jobs %install + # Ship our own file to not depend on a display manager being installed (boo#1108329) + install -D -m0644 %{SOURCE3} %{buildroot}%{_sysconfdir}/pam.d/kscreenlocker %kf5_makeinstall -C build %if %{with lang} %kf5_find_lang @@ -133,6 +131,7 @@ exit 0 %files %license COPYING* +%{_sysconfdir}/pam.d/kscreenlocker %{_kf5_libdir}/libexec/kcheckpass %{_kf5_libdir}/libexec/kscreenlocker_greet %{_kf5_servicesdir}/