diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 0f5364e..8551d50 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1727293098 -commit: 4ccb2378cf598025ed7140843f9027c7d6380bb9bd3e3c93331dab8f27d8db43 +mtime: 1727296226 +commit: 73fb2a82f612a286176bd085d3250101f93e35e8d95604062552e3d66d837c69 url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index fdb21eb..17c037d 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:441091ecf051081f41d6ce35497d9906309861b1791c10f0033c95af3a33ff83 +oid sha256:c00fdea96fa1ac816e113deb1157e991d822cc2d43385f56356f905bd4843224 size 256 diff --git a/sssd.spec b/sssd.spec index 0bb4dd9..17e610d 100644 --- a/sssd.spec +++ b/sssd.spec @@ -85,7 +85,7 @@ BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(tdb) >= 1.1.3 BuildRequires: pkgconfig(tevent) -BuildRequires: pkgconfig(uuid) nfsidmap-devel +BuildRequires: pkgconfig(uuid) %if 0%{?suse_version} && 0%{?suse_version} < 1600 # samba-client-devel pulls samba-client-libs pulls libldap-2_4-2 wants libldap-data(-2.4); # this conflicts with @@ -427,7 +427,7 @@ perl -i -lpe 's{%_bindir/python\b}{%_bindir/python3}' src/tools/sss_obfuscate b="%buildroot" # Copy some defaults -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" install -D -p -m 0600 src/examples/sssd-example.conf "$b/%_distconfdir/sssd/sssd.conf" install -d -m 0755 "$b/%_distconfdir/sssd/conf.d" %else @@ -471,7 +471,7 @@ sed -i '1s@#!.*python.*@#!%{_bindir}/python3.11@' %{buildroot}/%{_libexecdir}/%{ %pre %service_add_pre sssd.service -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" # Prepare for migration to /usr/etc; save any old .rpmsave 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" || : @@ -564,7 +564,7 @@ touch /run/systemd/rpm/sssd-was-active fi %posttrans -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" # Migration to /usr/etc, restore just created .rpmsave 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" || : @@ -678,7 +678,7 @@ fi %attr(755,root,root) %dir %sssdstatedir/mc/ %attr(700,root,root) %dir %sssdstatedir/keytabs/ %attr(750,root,root) %dir %_localstatedir/log/%name/ -%if %{?_distconfdir:1} +%if "%{?_distconfdir}" != "" %dir %_distconfdir/sssd/ %%dir %_distconfdir/sssd/conf.d %config(noreplace) %_distconfdir/sssd/sssd.conf