From 6d60adcb36902cd54d5b2ad18b0aa0acb5b367e6ae8865ca980f423556954a2b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
Date: Wed, 8 Jan 2020 20:25:44 +0000
Subject: [PATCH] Plasma 5.17.5

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/kscreenlocker?expand=0&rev=200
---
 kscreenlocker => kde            |  2 ++
 kscreenlocker-5.17.4.tar.xz     |  3 ---
 kscreenlocker-5.17.4.tar.xz.sig | 11 -----------
 kscreenlocker-5.17.5.tar.xz     |  3 +++
 kscreenlocker-5.17.5.tar.xz.sig | 11 +++++++++++
 kscreenlocker.changes           | 17 +++++++++++++++++
 kscreenlocker.spec              | 14 ++++++++------
 7 files changed, 41 insertions(+), 20 deletions(-)
 rename kscreenlocker => kde (67%)
 delete mode 100644 kscreenlocker-5.17.4.tar.xz
 delete mode 100644 kscreenlocker-5.17.4.tar.xz.sig
 create mode 100644 kscreenlocker-5.17.5.tar.xz
 create mode 100644 kscreenlocker-5.17.5.tar.xz.sig

diff --git a/kscreenlocker b/kde
similarity index 67%
rename from kscreenlocker
rename to kde
index 6dcaffa..1cf176a 100644
--- a/kscreenlocker
+++ b/kde
@@ -1,4 +1,6 @@
 #%PAM-1.0
+# This service is only used by kcheckpass for unlocking,
+# so only auth is really relevant here.
 auth     include        common-auth
 account  include        common-account
 password include        common-password
diff --git a/kscreenlocker-5.17.4.tar.xz b/kscreenlocker-5.17.4.tar.xz
deleted file mode 100644
index 6020659..0000000
--- a/kscreenlocker-5.17.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:9c7d0d5efad6a8d28889b75b08f17b074000959f03ed2c78b7f69e0af6c1466c
-size 123716
diff --git a/kscreenlocker-5.17.4.tar.xz.sig b/kscreenlocker-5.17.4.tar.xz.sig
deleted file mode 100644
index 7d0a6ea..0000000
--- a/kscreenlocker-5.17.4.tar.xz.sig
+++ /dev/null
@@ -1,11 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl3mURwACgkQ7JTRj38F
-mX6iBQgAgYx7Z+OyE6RbOsmvlxfcU76fkamA2eZkoRhIfWP0weKbRwyvXx+hTqsr
-AFCChoxEGhlXLsQCDqz83x3ZMM/abNQva5ZtPZx4YHbyTQ1M4dYWk6gyc/XfsFUi
-D8/9JuArYHjIqExuDshB6rsTDciLsjIhX/RooJgNUHvOjgORqS2NL+6upoL5flmI
-V1BBmj/ceZu7oOdoPME8EQejOomGfUaKmawCH74PIb9x/N/ANCzlbduw7mABwnsy
-lKih6OP5xgFwuEg5ougTcXa8bcbLVj4lIWLTlM6piUdnMopMnrnZC3wJwdQUfLoH
-VBXEqFHoLugEswPps8ZIsldzLJ0K6Q==
-=ygyj
------END PGP SIGNATURE-----
diff --git a/kscreenlocker-5.17.5.tar.xz b/kscreenlocker-5.17.5.tar.xz
new file mode 100644
index 0000000..88cfa2c
--- /dev/null
+++ b/kscreenlocker-5.17.5.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:078cfaa9f117a985f5c71152bdf4a9f5cb65ef23c0090cfaaccc9539770f138f
+size 123744
diff --git a/kscreenlocker-5.17.5.tar.xz.sig b/kscreenlocker-5.17.5.tar.xz.sig
new file mode 100644
index 0000000..257c791
--- /dev/null
+++ b/kscreenlocker-5.17.5.tar.xz.sig
@@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQEzBAABCgAdFiEELR1bBYg1d4fenuIl7JTRj38FmX4FAl4UpBcACgkQ7JTRj38F
+mX7F7ggAkgcZCMhdc+hYu3tBrOGUluVTLet9fUhd5Ni+f5QnMVs6Xa2Ks1swhlSy
+Uqg059biim/nTcOn8bO/X6/Zl5p698RRM9oAZKKjNh1TWJguGr+gVLsdS7c03UtE
+vV5fT2zu0UuFxLIIveOkWXsWMJavBhhyk9UfbIMykRhwgIWkuVHciWLN+V4v/WEs
+kudSzhbzDvNr7b6ZLkb55rqGxbMLw5YN+AwUd3FpKR8ndSax2m0pit4vI9AAP3ge
+dztYEAYaQD/3r7BHx1xEX4hxTXTB+1eBvCeYLHPkJ9/+NHNJbs6Mfo6B/4gTIVuB
+YEm8OK2alZ+PiS46enZLd/iIqlNlYQ==
+=SKSo
+-----END PGP SIGNATURE-----
diff --git a/kscreenlocker.changes b/kscreenlocker.changes
index 9078fc6..8b874b1 100644
--- a/kscreenlocker.changes
+++ b/kscreenlocker.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Jan  7 16:24:35 UTC 2020 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Update to 5.17.5
+  * New bugfix release
+  * For more details please see:
+  * https://www.kde.org/announcements/plasma-5.17.5.php
+- No code changes since 5.17.4
+
+-------------------------------------------------------------------
+Thu Dec 12 10:39:10 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Rename kscreenlocker pam file to kde (boo#1158966)
+- Use %_distconfdir for saving the PAM service file. No migration
+  code for .rpmsave added as the file was never supposed to be
+  modified.
+
 -------------------------------------------------------------------
 Wed Dec  4 08:36:59 UTC 2019 - Fabian Vogt <fabian@ritter-vogt.de>
 
diff --git a/kscreenlocker.spec b/kscreenlocker.spec
index 0e549f5..ada8dbc 100644
--- a/kscreenlocker.spec
+++ b/kscreenlocker.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package kscreenlocker
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,9 +16,11 @@
 #
 
 
+%{!?_distconfdir:%global _distconfdir %_sysconfdir}
+
 %bcond_without lang
 Name:           kscreenlocker
-Version:        5.17.4
+Version:        5.17.5
 Release:        0
 Summary:        Library and components for secure lock screen architecture
 License:        GPL-2.0-or-later
@@ -29,7 +31,7 @@ Source:         https://download.kde.org/stable/plasma/%{version}/kscreenlocker-
 Source1:        https://download.kde.org/stable/plasma/%{version}/kscreenlocker-%{version}.tar.xz.sig
 Source2:        plasma.keyring
 %endif
-Source3:        kscreenlocker
+Source3:        kde
 BuildRequires:  cmake >= 2.8.12
 BuildRequires:  extra-cmake-modules >= 1.8.0
 BuildRequires:  kf5-filesystem
@@ -88,12 +90,12 @@ Development files for Library and components for secure lock screen architecture
 %setup -q -n %{name}-%{version}
 
 %build
-  %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=kscreenlocker -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir}
+  %cmake_kf5 -d build -- -DKDE4_COMMON_PAM_SERVICE=kde -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
+  install -D -m0644 %{SOURCE3} %{buildroot}%{_distconfdir}/pam.d/kde
   %kf5_makeinstall -C build
 %if %{with lang}
   %kf5_find_lang
@@ -126,7 +128,7 @@ exit 0
 
 %files
 %license COPYING*
-%config(noreplace) %{_sysconfdir}/pam.d/kscreenlocker
+%{_distconfdir}/pam.d/kde
 %{_kf5_libdir}/libexec/kcheckpass
 %{_kf5_libdir}/libexec/kscreenlocker_greet
 %{_kf5_servicesdir}/