From 523577d0c6081dd396222af02592464db935df331e7333262c8c30934310a483 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Fri, 17 Nov 2023 14:14:26 +0000
Subject: [PATCH] Accepting request 1127298 from home:scabrero:jsc-ped6714

- /usr/etc migration, restore /etc/sssd/sssd.conf.rpmsave after
  update (bsc#1216865)
- Do not install the KRB5 IDP plugin, it is useless without the
  OIDC child
- Drop no longer valid --without-secrets configure switch

OBS-URL: https://build.opensuse.org/request/show/1127298
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=300
---
 sssd.changes |  9 +++++++++
 sssd.spec    | 19 +++++--------------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sssd.changes b/sssd.changes
index 95b2cc3..420cc15 100644
--- a/sssd.changes
+++ b/sssd.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Fri Nov 17 12:30:33 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
+
+- /usr/etc migration, restore /etc/sssd/sssd.conf.rpmsave after
+  update (bsc#1216865)
+- Do not install the KRB5 IDP plugin, it is useless without the
+  OIDC child
+- Drop no longer valid --without-secrets configure switch
+
 -------------------------------------------------------------------
 Mon Nov 13 12:48:09 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/sssd.spec b/sssd.spec
index 45ceae5..cd9e144 100644
--- a/sssd.spec
+++ b/sssd.spec
@@ -369,7 +369,6 @@ autoreconf -fiv
 	--with-subid \
 	--with-os=suse \
 	--disable-ldb-version-check \
-	--without-secrets \
 	--without-python2-bindings \
 	--without-oidc-child
 %make_build all
@@ -407,14 +406,10 @@ ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
 
 %pre
 %service_add_pre sssd.service
-%if 0%{?suse_version} > 1500
 # Prepare for migration to /usr/etc; save any old .rpmsave
-for i in pam.d/sssd-shadowutils logrotate.d/sssd ; do
-	if [ -f "%_sysconfdir/$i.rpmsave" ]; then
-		mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || :
-	fi
+for i in sssd/sssd.conf pam.d/sssd-shadowutils logrotate.d/sssd ; do
+	test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
 done
-%endif
 
 %post
 /sbin/ldconfig
@@ -484,15 +479,11 @@ fi
 %postun kcm
 %service_del_postun sssd-kcm.service sssd-kcm.socket
 
-%if 0%{?suse_version} > 1500
 %posttrans
 # Migration to /usr/etc, restore just created .rpmsave
-for i in logrotate.d/sssd pam.d/sssd-shadowutils ; do
-	if [ -f "%_sysconfdir/$i.rpmsave" ]; then
-		mv -v "%_sysconfdir/$i.rpmsave" "%_sysconfdir/$i.rpmsave.old" || :
-	fi
+for i in sssd/sssd.conf logrotate.d/sssd pam.d/sssd-shadowutils ; do
+	test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
 done
-%endif
 
 %files -f sssd.lang
 %license COPYING
@@ -658,7 +649,7 @@ done
 %dir %_libdir/%name/
 %_libdir/%name/libsss_krb5.so
 %dir %_datadir/%name/
-%_datadir/%name/krb5-snippets/
+%exclude %_datadir/%name/krb5-snippets/
 %dir %_datadir/%name/sssd.api.d/
 %_datadir/%name/sssd.api.d/sssd-krb5.conf
 %dir %_mandir/??/