rpms/nss_ldap/devel nss_ldap.spec, 1.117, 1.118 nss_ldap.versions, 1.2, NONE pam_ldap.versions, 1.2, NONE

[Nalin Dahyabhai]

Author: nalin

Update of /cvs/extras/rpms/nss_ldap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv30512

Modified Files:
	nss_ldap.spec 
Removed Files:
	nss_ldap.versions pam_ldap.versions 
Log Message:
- switch to linking with the evolution-specific libldap, because that's still
  available as a static library (#565065)
- drop no-longer-used .versions files of our own



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/extras/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- nss_ldap.spec	4 Nov 2009 18:04:30 -0000	1.117
+++ nss_ldap.spec	16 Feb 2010 00:24:44 -0000	1.118
@@ -2,11 +2,9 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 264
-Release: 8%{?dist}
+Release: 9%{?dist}
 Source0: ftp://ftp.padl.com/pub/nss_ldap-%{version}.tar.gz
 Source1: ftp://ftp.padl.com/pub/pam_ldap-%{pam_ldap_version}.tar.gz
-Source3: nss_ldap.versions
-Source4: pam_ldap.versions
 Source5: README.TLS
 Source6: version.c
 Source7: dlopen.sh
@@ -37,6 +35,7 @@ BuildRequires: autoconf, automake, libto
 BuildRequires: openssl-devel, openssl-static, pam-devel
 BuildRequires: cyrus-sasl-devel >= 2.1
 BuildRequires: openldap-devel >= 2.0.27
+BuildRequires: openldap-evolution-devel
 BuildRequires: krb5-devel >= 1.4
 Requires: nscd
 Obsoletes: pam_ldap
@@ -122,7 +121,7 @@ pushd nss_ldap-%{version}
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -L%{_libdir}/evolution-openldap/%{_lib} -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
@@ -198,6 +197,11 @@ fi
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Mon Feb 15 2010 Nalin Dahyabhai <nalin at redhat.com> 264-9
+- switch to linking with the evolution-specific libldap, because that's still
+  available as a static library (#565065)
+- drop no-longer-used .versions files of our own
+
 * Wed Nov  4 2009 Nalin Dahyabhai <nalin at redhat.com> 264-8
 - add "rtkit" and "pulse" to the list of users whom we default to ignoring
   for looking up supplemental groups (Gordon Messmer, part of #186527)


--- nss_ldap.versions DELETED ---


--- pam_ldap.versions DELETED ---