From 7d062dd5f9f2bd256d0ed672582dbdd8e93379d49f8a2b7e005d0791832204e7 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 17 Jan 2022 17:29:28 +0000 Subject: [PATCH] - Upgrade LDB_DIR shell variable to %ldbdir macro. OBS-URL: https://build.opensuse.org/package/show/network:ldap/sssd?expand=0&rev=257 --- sssd.changes | 5 +++++ sssd.spec | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/sssd.changes b/sssd.changes index c4e4522..76a0854 100644 --- a/sssd.changes +++ b/sssd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Jan 17 17:27:40 UTC 2022 - Jan Engelhardt + +- Upgrade LDB_DIR shell variable to %ldbdir macro. + ------------------------------------------------------------------- Tue Jan 11 18:04:46 UTC 2022 - Samuel Cabrero diff --git a/sssd.spec b/sssd.spec index c5137d5..edf9044 100644 --- a/sssd.spec +++ b/sssd.spec @@ -89,6 +89,7 @@ Obsoletes: libsss_sudo < %version-%release %define pipepath %sssdstatedir/pipes %define pubconfpath %sssdstatedir/pubconf %define gpocachepath %sssdstatedir/gpo_cache +%define ldbdir %(pkg-config ldb --variable=modulesdir) # Both SSSD and cifs-utils provide an idmap plugin for cifs.ko # /etc/cifs-utils/idmap-plugin should be a symlink to one of the 2 idmap plugins @@ -364,7 +365,6 @@ Security Services Daemon (sssd). %autosetup -p1 %build -export LDB_DIR="$(pkg-config ldb --variable=modulesdir)" # help configure find nscd export PATH="$PATH:/usr/sbin" @@ -381,7 +381,7 @@ autoreconf -fiv --with-pid-path="%_rundir" \ --enable-nsslibdir="/%_lib" \ --enable-pammoddir="/%_lib/security" \ - --with-ldb-lib-dir="$LDB_DIR" \ + --with-ldb-lib-dir="%ldbdir" \ --with-selinux=no \ --with-os=suse \ --with-semanage=no \ @@ -539,8 +539,7 @@ fi %dir %_libdir/%name/modules/ %_libdir/%name/modules/libsss_autofs.so %_libdir/libsss_sudo.so -%dir %_libdir/ldb/ -%_libdir/ldb/memberof.so +%ldbdir/ %dir %_libexecdir/%name/ %_libexecdir/%name/p11_child %_libexecdir/%name/sssd_autofs