More obsoletions + kirigami-addons 1.0.1

OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/kscreenlocker6?expand=0&rev=4

kscreenlocker6.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar  5 08:40:32 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
+
+- Remove kscreenlocker_greet restart in %post, no longer necessary
+  after kcheckpass got removed
+
 -------------------------------------------------------------------
 Wed Feb 21 18:36:13 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
 

kscreenlocker6.spec

@@ -73,9 +73,10 @@ BuildRequires:  pkgconfig(xcb-xtest)
 BuildRequires:  pkgconfig(xcursor)
 BuildRequires:  pkgconfig(xi)
 Requires:       pam-config
-Requires(post): /usr/bin/killall
 Provides:       qt6qmlimport(org.kde.kscreenlocker.1) = 0
-Conflicts:      kscreenlocker
+Provides:       kscreenlocker = %{version}
+Obsoletes:      kscreenlocker < %{version}
+Obsoletes:      kscreenlocker-lang < %{version}
 
 %description
 Library and components for secure lock screen architecture.
@@ -115,22 +116,6 @@ install -D -m0644 %{SOURCE5} %{buildroot}%{_pam_vendordir}/kde-smartcard
 
 %find_lang %{name} --all-name
 
-%pre
-# TODO: Add a check for kscreenlocker_greet version, once available.
-# Upstream told that that would not be possible, but upstream is unreasonable.
-if [ $1 = 2 ]; then
-    touch /run/kscreenlocker6_restart
-fi
-exit 0
-
-%post
-%ldconfig
-if [ $1 = 2 ] && [ -f /run/kscreenlocker6_restart ]; then
-    /usr/bin/killall -q -TERM kscreenlocker_greet || :
-    rm /run/kscreenlocker6_restart
-fi
-exit 0
-
 %ldconfig_scriptlets -n libKScreenLocker6
 
 %files