SHA256
1
0
forked from jengelh/sssd

Accepting request 1121467 from home:scabrero:branches:network:ldap

- Update dependencies to require the same subpackages version and
  release
- Fix /usr/etc migration fragment in wrong "%pre kcm" instead of
  "%pre"
- Move sss_analyze to sssd-tools package

OBS-URL: https://build.opensuse.org/request/show/1121467
OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=292
This commit is contained in:
Jan Engelhardt 2023-10-31 16:18:26 +00:00 committed by Git OBS Bridge
parent 72957e6cab
commit aa747329c7
2 changed files with 26 additions and 22 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Oct 31 15:20:37 UTC 2023 - Samuel Cabrero <scabrero@suse.de>
- Update dependencies to require the same subpackages version and
release
- Fix /usr/etc migration fragment in wrong "%pre kcm" instead of
"%pre"
- Move sss_analyze to sssd-tools package
-------------------------------------------------------------------
Tue Oct 31 11:04:57 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
@ -1955,3 +1964,4 @@ Fri Sep 4 08:59:21 UTC 2009 - rhafer@novell.com
Tue Sep 1 08:58:37 UTC 2009 - rhafer@novell.com
- initial package submission

View File

@ -117,7 +117,7 @@ services for projects like FreeIPA.
Summary: The ActiveDirectory backend plugin for sssd
License: GPL-3.0-or-later
Group: System/Daemons
Requires: %name-krb5-common = %version
Requires: %name-krb5-common = %{version}-%{release}
Requires: adcli
%description ad
@ -163,7 +163,7 @@ caches.
Summary: The Kerberos authentication backend plugin for sssd
License: GPL-3.0-or-later
Group: System/Daemons
Requires: %name-krb5-common = %version-%release
Requires: %name-krb5-common = %{version}-%{release}
%description krb5
Provides the Kerberos back end that the SSSD can utilize authenticate
@ -183,7 +183,7 @@ use for Kerberos user or host authentication.
Summary: The LDAP backend plugin for sssd
License: GPL-3.0-or-later
Group: System/Daemons
Requires: %name-krb5-common = %version-%release
Requires: %name-krb5-common = %{version}-%{release}
%description ldap
Provides the LDAP back end that the SSSD can utilize to fetch
@ -202,7 +202,7 @@ and/or PAM modules to leverage SSSD caching.
Summary: Commandline tools for sssd
License: GPL-3.0-or-later AND LGPL-3.0-or-later
Group: System/Management
Requires: python3-sssd-config = %version
Requires: python3-sssd-config = %{version}-%{release}
Requires: sssd = %version
%description tools
@ -410,7 +410,7 @@ ln -sfv %_sysconfdir/alternatives/%cifs_idmap_name %buildroot/%cifs_idmap_plugin
%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 ; do
for i in pam.d/sssd-shadowutils logrotate.d/sssd ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
@ -473,20 +473,6 @@ fi
%pre kcm
%service_add_pre sssd-kcm.service sssd-kcm.socket
%if 0%{?suse_version} > 1500
# Prepare for migration to /usr/etc; save any old .rpmsave
for i in logrotate.d/sssd ; do
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i}.rpmsave.old ||:
done
%endif
%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
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
%post kcm
%service_add_post sssd-kcm.service sssd-kcm.socket
@ -497,6 +483,14 @@ done
%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
test -f %{_sysconfdir}/${i}.rpmsave && mv -v %{_sysconfdir}/${i}.rpmsave %{_sysconfdir}/${i} ||:
done
%endif
%files -f sssd.lang
%license COPYING
%_unitdir/sssd.service
@ -560,7 +554,6 @@ done
%_libexecdir/%name/sssd_pam
%_libexecdir/%name/sssd_ssh
%_libexecdir/%name/sssd_sudo
%_libexecdir/%name/sss_analyze
%_libexecdir/%name/sss_signal
%_libexecdir/%name/sssd_check_socket_activated_responders
%_libexecdir/%name/selinux_child
@ -703,6 +696,7 @@ done
%_sbindir/sss_seed
%_sbindir/sss_obfuscate
%_sbindir/sss_override
%_libexecdir/%name/sss_analyze
%dir %_mandir/??/man8/
%_mandir/??/man8/sssctl.8*
%_mandir/??/man8/sss_*.8*