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-5.13.5.tar.xz b/kscreenlocker-5.13.5.tar.xz deleted file mode 100644 index f931dd7..0000000 --- a/kscreenlocker-5.13.5.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:28e84e59cee7f28fabe5c446f76d0898c7da32e050ab9bd65c738c91d3943f9c -size 122112 diff --git a/kscreenlocker-5.14.0.tar.xz b/kscreenlocker-5.14.0.tar.xz new file mode 100644 index 0000000..c0deebb --- /dev/null +++ b/kscreenlocker-5.14.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:414ef68a691f4eba92d9a491f8d354387012d1009d19826d28ef3e4bbc44cddb +size 121216 diff --git a/kscreenlocker-5.14.0.tar.xz.sig b/kscreenlocker-5.14.0.tar.xz.sig new file mode 100644 index 0000000..957f78b --- /dev/null +++ b/kscreenlocker-5.14.0.tar.xz.sig @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQEzBAABCAAdFiEEs8s2ZVJUC+Bu6a2XEZaMRJKMrvwFAlu3mT4ACgkQEZaMRJKM +rvwxoAf8DtSB5soaNWpExDnX/GzOCg3FuC275HJg4BzU3tPX7wDormYPSjTqdH1r +Yl0dXgHfgct1sBSrbh+/sGix8FsqArAg18TZiAH/CzSJIUt9dByFypazZZsUDNRP +OfCb45RvN+xQbyQ1U5G4Tk5Kw8gKsSKkesOwNNVXvfvh+qaPKRZih9baqVmfc7KS +r++eC7OqNZWfItshxcp4Qs5Yzzvh/LFnL/OWu0d57AG1l99D+I9hDXOHuN92eQ1v +UfgklqUstAczoTbqe8qUIYxI4sE3tyucT4FAqIYH8hsK2fRRGrrPaZu0q2mwSIVY +wzupAxjNlxp7EDhllv4n4Nqy7QuK8A== +=1kjS +-----END PGP SIGNATURE----- diff --git a/kscreenlocker.changes b/kscreenlocker.changes index 005a951..4dde091 100644 --- a/kscreenlocker.changes +++ b/kscreenlocker.changes @@ -1,3 +1,44 @@ +------------------------------------------------------------------- +Fri Oct 5 10:01:10 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.14.0 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.14.0.php +- No code changes since 5.13.90 + +------------------------------------------------------------------- +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 + +- Add tarball signature and keyring containing keys of release managers + Jonathan Riddell and Bhushan Shah + +------------------------------------------------------------------- +Thu Sep 13 17:25:00 UTC 2018 - fabian@ritter-vogt.de + +- Update to 5.13.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/plasma-5.13.90.php +- Changes since 5.13.5: + * Fix the plasma-workspace build. + * Export install location for DBUS interfaces via CMake + * QT_MIN_VERSIONS is Qt 5.11 for Plasma 5.14. Agreed at kickoff meeting. Set everywhere for clearity and consistency. + * Install our org.kde.screensaver interface definition + * Prevent paste in screen locker (kde#388049) + * Load QtQuickSettings for software rendering + * Force software rendering when greeter crashed + * Fix build, remove some implicit QString casts + * Make it compile with strict compile flags + * Add explicit + ------------------------------------------------------------------- Tue Sep 4 10:58:40 UTC 2018 - fabian@ritter-vogt.de diff --git a/kscreenlocker.spec b/kscreenlocker.spec index 5913c69..bf90ad1 100644 --- a/kscreenlocker.spec +++ b/kscreenlocker.spec @@ -18,15 +18,18 @@ %bcond_without lang Name: kscreenlocker -Version: 5.13.5 +Version: 5.14.0 Release: 0 Summary: Library and components for secure lock screen architecture License: GPL-2.0-or-later Group: System/GUI/KDE Url: https://projects.kde.org/kscreenlocker -Source: http://download.kde.org/stable/plasma/%{version}/kscreenlocker-%{version}.tar.xz -# PATCH-FIX-OPENSUSE fix-wayland-version-requirement.diff -- Changes wayland requirement from 1.3 to 1.2.1 -Patch0: fix-wayland-version-requirement.diff +Source: kscreenlocker-%{version}.tar.xz +%if %{with lang} +Source1: kscreenlocker-%{version}.tar.xz.sig +Source2: plasma.keyring +%endif +Source3: kscreenlocker BuildRequires: cmake >= 2.8.12 BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: kf5-filesystem @@ -57,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 @@ -84,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 @@ -129,6 +131,7 @@ exit 0 %files %license COPYING* +%{_sysconfdir}/pam.d/kscreenlocker %{_kf5_libdir}/libexec/kcheckpass %{_kf5_libdir}/libexec/kscreenlocker_greet %{_kf5_servicesdir}/ diff --git a/plasma.keyring b/plasma.keyring new file mode 100644 index 0000000..5e9faf8 Binary files /dev/null and b/plasma.keyring differ