SPECS: evolution-data-server.spec - rel 4 - it's e-d-s that needs ...

[baggins]

Author: baggins                      Date: Wed Nov  7 12:06:05 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 4
- it's e-d-s that needs specially prepared openldap for exchange support

---- Files affected:
SPECS:
   evolution-data-server.spec (1.109 -> 1.110) 

---- Diffs:

================================================================
Index: SPECS/evolution-data-server.spec
diff -u SPECS/evolution-data-server.spec:1.109 SPECS/evolution-data-server.spec:1.110
--- SPECS/evolution-data-server.spec:1.109	Sun Nov  4 18:06:49 2007
+++ SPECS/evolution-data-server.spec	Wed Nov  7 13:06:00 2007
@@ -13,11 +13,12 @@
 Summary(pl.UTF-8):	Serwer danych Evolution
 Name:		evolution-data-server
 Version:	1.12.1
-Release:	3
+Release:	4
 License:	GPL
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/evolution-data-server/1.12/%{name}-%{version}.tar.bz2
 # Source0-md5:	5b4d855ed1ceaaab7db14b50133b5252
+Patch0:		%{name}-ntlm-ldap.patch
 URL:		http://www.gnome.org/projects/evolution/
 BuildRequires:	ORBit2-devel >= 1:2.14.8
 BuildRequires:	autoconf >= 2.52
@@ -36,7 +37,7 @@
 BuildRequires:	libtool
 BuildRequires:	nspr-devel
 BuildRequires:	nss-devel
-%{?with_ldap:BuildRequires:	openldap-devel >= 2.4.6}
+%{?with_ldap:BuildRequires:	openldap-evolution-devel >= 2.4.6}
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.304
 Requires(post,postun):	scrollkeeper
@@ -128,6 +129,7 @@
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__glib_gettextize}
@@ -145,10 +147,21 @@
 %{__autoconf}
 %{__automake}
 cd ../..
+
+# Set LIBS so that configure will be able to link with static LDAP libraries,
+# which depend on Cyrus SASL and OpenSSL.
+if pkg-config openssl ; then
+	LIBS="-lsasl2 `pkg-config --libs openssl`"
+else
+	LIBS="-lsasl2 -lssl -lcrypto"
+fi
+export LIBS
+
 %configure \
 	%{?with_kerberos5:--with-krb5=%{_prefix}} \
 	%{!?with_kerberos5:--with-krb5=no} \
-	%{?with_ldap:--with-openldap=yes} \
+	%{?with_ldap:--with-openldap=%{_libdir}/evolution-openldap} \
+	%{?with_ldap:--with-static-ldap=yes} \
 	%{!?with_ldap:--with-openldap=no} \
 	--enable-gnome-keyring=yes \
 	--enable-gtk-doc \
@@ -256,6 +269,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.110  2007/11/07 12:06:00  baggins
+- rel 4
+- it's e-d-s that needs specially prepared openldap for exchange support
+
 Revision 1.109  2007/11/04 17:06:49  ankry
 - sr at Latn -> sr at latin, rel. 3
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/evolution-data-server.spec?r1=1.109&r2=1.110&f=u