rpms/nss-ldapd/devel nss-ldapd-0.6.11-dso.patch, NONE, 1.1 nss-ldapd.spec, 1.6, 1.7

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/nss-ldapd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31136

Modified Files:
	nss-ldapd.spec 
Added Files:
	nss-ldapd-0.6.11-dso.patch 
Log Message:
- link with liblber whenever we link with libldap (will have to fix this
  better when the package's rename review completes) (#564861)


nss-ldapd-0.6.11-dso.patch:
 configure.ac |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE nss-ldapd-0.6.11-dso.patch ---
If we find libldap or libldap_r, append liblber to the list of libraries we
try to link.  The ordering's wrong, so it's not right for the general case, but
it'll do for now.
diff -up nss-ldapd-0.6.11/configure.ac nss-ldapd-0.6.11/configure.ac
--- nss-ldapd-0.6.11/configure.ac	2010-02-15 15:59:45.000000000 -0500
+++ nss-ldapd-0.6.11/configure.ac	2010-02-15 16:22:49.000000000 -0500
@@ -342,7 +342,11 @@ fi
 
 if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = umich -o $with_ldap_lib = openldap \)
 then
-  AC_SEARCH_LIBS(ldap_search_ext,[ldap_r ldap],found_ldap_lib=yes,,)
+  AC_SEARCH_LIBS(ldap_search_ext,[ldap_r ldap],found_ldap_lib=yes,,-llber)
+  case "x$ac_cv_search_ldap_search_ext" in
+  xno|"xnone required");;
+  *) LIBS="$LIBS -llber";;
+  esac
 fi
 if test -z "$found_ldap_lib" -a \( $with_ldap_lib = auto -o $with_ldap_lib = netscape5 \)
 then


Index: nss-ldapd.spec
===================================================================
RCS file: /cvs/extras/rpms/nss-ldapd/devel/nss-ldapd.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- nss-ldapd.spec	24 Sep 2009 18:35:29 -0000	1.6
+++ nss-ldapd.spec	16 Feb 2010 00:32:44 -0000	1.7
@@ -5,7 +5,7 @@
 
 Name:		nss-ldapd
 Version:	0.6.11
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	An nsswitch module which uses directory servers
 Group:		System Environment/Base
 License:	LGPLv2+
@@ -13,8 +13,10 @@ URL:		http://arthurdejong.org/nss-ldapd/
 Source0:	http://arthurdejong.org/nss-ldapd/nss-ldapd-%{version}.tar.gz
 Source1:	http://arthurdejong.org/nss-ldapd/nss-ldapd-%{version}.tar.gz.sig
 Source2:	nslcd.init
+Patch0:		nss-ldapd-0.6.11-dso.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	openldap-devel, krb5-devel
+BuildRequires:	autoconf, automake, libtool
 
 # Pull in the pam_ldap module, which is currently bundled with nss_ldap, to
 # keep upgrades from removing the module.  When nss-ldapd grows its own
@@ -31,6 +33,8 @@ nsswitch module.
 
 %prep
 %setup -q
+%patch0 -p1 -b .dso
+autoreconf -f
 
 %build
 %configure --libdir=/%{_lib}
@@ -150,6 +154,10 @@ fi
 exit 0
 
 %changelog
+* Mon Feb 15 2010 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-3
+- link with liblber whenever we link with libldap (will have to fix this
+  better when the package's rename review completes) (#564861)
+
 * Thu Sep 24 2009 Nalin Dahyabhai <nalin at redhat.com> 0.6.11-2
 - rebuild