rpms/nss_ldap/devel nss_ldap.spec,1.96,1.97

[Nalin Dahyabhai]

Author: nalin

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

Modified Files:
	nss_ldap.spec 
Log Message:
- add libssl and libcrypto to the list of libraries against which we link
  statically to avoid running into symbol collisions at run-time (#446860)

Not really a fix, more of a workaround.



Index: nss_ldap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nss_ldap/devel/nss_ldap.spec,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -r1.96 -r1.97
--- nss_ldap.spec	16 Jul 2008 18:22:25 -0000	1.96
+++ nss_ldap.spec	11 Sep 2008 21:06:29 -0000	1.97
@@ -2,7 +2,7 @@
 Summary: NSS library and PAM module for LDAP
 Name: nss_ldap
 Version: 261
-Release: 1%{?dist}
+Release: 3%{?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
@@ -112,7 +112,7 @@
         --enable-schema-mapping \
         --enable-rfc2307bis \
         --enable-configurable-krb5-ccname-gssapi
-make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -Wl,-Bdynamic -lsasl2 -lgssapi_krb5 -lssl -ldl -lpthread_nonshared -lnsl -lresolv"
+make %{?_smp_mflags} LIBS="-Wl,-Bstatic -lldap -llber -lssl -lcrypto -Wl,-Bdynamic -lz -lsasl2 -lgssapi_krb5 -ldl -lpthread_nonshared -lnsl -lresolv"
 popd
 
 # Check that the modules are actually loadable.
@@ -188,6 +188,13 @@
 %doc pam_ldap-%{pam_ldap_version}/ns-pwd-policy.schema
 
 %changelog
+* Thu Sep 11 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-3
+- promote the previous change from a scratch build to the real thing
+
+* Tue Aug 26 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-2
+- add libssl and libcrypto to the list of libraries against which we link
+  statically to avoid running into symbol collisions at run-time (#446860)
+
 * Wed Jul 16 2008 Nalin Dahyabhai <nalin at redhat.com> - 261-1
 - update to version 261
 - remove fuzz from patches