rpms/evolution-exchange/devel evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch, 1.1, 1.2 evolution-exchange.spec, 1.75, 1.76

[Matthew Barnes]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-exchange/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14053

Modified Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch 
	evolution-exchange.spec 
Log Message:
Update multilib patch.


evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch:
 evo_ldap_check.m4 |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

Index: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch	6 Jun 2007 19:02:01 -0000	1.1
+++ evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch	17 Nov 2009 16:33:15 -0000	1.2
@@ -1,10 +1,10 @@
-diff -up ximian-connector-2.0.2-pristine/acinclude.m4 ximian-connector-2.0.2-64bit_fix/acinclude.m4
---- ximian-connector-2.0.2-pristine/acinclude.m4	2004-10-12 19:00:06.225752438 -0400
-+++ ximian-connector-2.0.2-64bit_fix/acinclude.m4	2004-10-12 19:01:50.635944683 -0400
-@@ -34,6 +34,18 @@ AC_DEFUN([EVO_LDAP_CHECK], [
- 	AC_ARG_WITH(openldap,     [  --with-openldap=[no/yes/PREFIX]      Enable LDAP support in evolution])
- 	AC_ARG_WITH(static-ldap,  [  --with-static-ldap=[no/yes]          Link LDAP support statically into evolution ])
- 	AC_CACHE_CHECK([for OpenLDAP], ac_cv_with_openldap, ac_cv_with_openldap="${with_openldap:=$default}")
+diff -up evolution-exchange-2.29.2/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-exchange-2.29.2/m4/evo_ldap_check.m4
+--- evolution-exchange-2.29.2/m4/evo_ldap_check.m4.fix-64bit-acinclude	2009-10-24 00:26:32.000000000 -0400
++++ evolution-exchange-2.29.2/m4/evo_ldap_check.m4	2009-11-17 11:32:18.215497226 -0500
+@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
+ 		[AS_HELP_STRING([--with-static-ldap],
+ 		[Link LDAP support statically into evolution])])
+ 	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
 +
 +	AC_MSG_CHECKING(for multilib subdirectory)
 +	if test "$GCC" = "yes" ; then
@@ -20,7 +20,7 @@ diff -up ximian-connector-2.0.2-pristine
  	case $ac_cv_with_openldap in
  	no|"")
  		with_openldap=no
-@@ -44,7 +56,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
+@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
  	*)
  		with_openldap=$ac_cv_with_openldap
  		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
@@ -29,8 +29,8 @@ diff -up ximian-connector-2.0.2-pristine
  		;;
  	esac
  
-@@ -80,20 +92,20 @@ AC_DEFUN([EVO_LDAP_CHECK], [
- 		AC_CHECK_LIB(nsl, gethostbyaddr, LDAP_LIBS="$LDAP_LIBS -lnsl")
+@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
+ 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
  		AC_CHECK_LIB(lber, ber_get_tag, [
  			if test "$with_static_ldap" = "yes"; then
 -				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"


Index: evolution-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- evolution-exchange.spec	17 Nov 2009 15:45:54 -0000	1.75
+++ evolution-exchange.spec	17 Nov 2009 16:33:15 -0000	1.76
@@ -61,7 +61,7 @@ Microsoft Exchange Server.
 %prep
 %setup -q -n evolution-exchange-%{version}
 
-%patch11 -p1 -b .fix-64bit-acinclude.m4
+#%patch11 -p1 -b .fix-64bit-acinclude.m4
 
 %build
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED"