diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index 8430d5a..0f5364e 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1721210267 -commit: bf358d8fff9cbe6e4d724686e14b1ba2f74e5be0130abd0c1aec853471ca572e +mtime: 1727293098 +commit: 4ccb2378cf598025ed7140843f9027c7d6380bb9bd3e3c93331dab8f27d8db43 url: https://src.opensuse.org/jengelh/sssd revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index 50748d6..fdb21eb 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:595ba3e01a103ac52ae390b182d09c1409a75f41d4e84163a45110f486e9d316 +oid sha256:441091ecf051081f41d6ce35497d9906309861b1791c10f0033c95af3a33ff83 size 256 diff --git a/sssd.spec b/sssd.spec index 2466377..0bb4dd9 100644 --- a/sssd.spec +++ b/sssd.spec @@ -85,7 +85,14 @@ BuildRequires: pkgconfig(smbclient) BuildRequires: pkgconfig(talloc) BuildRequires: pkgconfig(tdb) >= 1.1.3 BuildRequires: pkgconfig(tevent) -BuildRequires: pkgconfig(uuid) +BuildRequires: pkgconfig(uuid) nfsidmap-devel +%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 +# openldap2-devel pulls libldap2 wants libldap-data(-2.6) +# Package contains just config files, not needed for build. +#!BuildIgnore: libldap-data +%endif %{?systemd_ordering} Requires: sssd-ldap = %version-%release Requires(postun): pam-config @@ -104,7 +111,7 @@ Obsoletes: sssd-common < %version-%release %define ldbdir %(pkg-config ldb --variable=modulesdir) # Both SSSD and cifs-utils provide an idmap plugin for cifs.ko -# %_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins +# %%_sysconfdir/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins # * cifs-utils one is the default (priority 20) # * installing SSSD should NOT switch to SSSD plugin (priority 10) %define cifs_idmap_plugin %_sysconfdir/cifs-utils/idmap-plugin