rpms/evolution-data-server/devel evolution-data-server.spec, 1.303, 1.304

Milan Crha mcrha at fedoraproject.org
Thu Jul 15 08:00:53 UTC 2010


Author: mcrha

Update of /cvs/pkgs/rpms/evolution-data-server/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32202

Modified Files:
	evolution-data-server.spec 
Log Message:
Add also Mozilla NSS crypto for LDAP, as it requires it now.
Patch by Rich Megginson



Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/devel/evolution-data-server.spec,v
retrieving revision 1.303
retrieving revision 1.304
diff -u -p -r1.303 -r1.304
--- evolution-data-server.spec	13 Jul 2010 13:38:00 -0000	1.303
+++ evolution-data-server.spec	15 Jul 2010 08:00:52 -0000	1.304
@@ -141,6 +141,13 @@ if pkg-config openssl ; then
 else
 	export LIBS="-lsasl2 -lssl -lcrypto"
 fi
+# newer versions of openldap are built with Mozilla NSS crypto, so also need
+# those libs to link with the static ldap libs
+if pkg-config nss ; then
+    export LIBS="$LIBS `pkg-config --libs nss`"
+else
+    export LIBS="$LIBS -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
+fi
 %else
 %define ldap_flags --with-openldap=yes
 %endif



More information about the scm-commits mailing list