rpms/evolution-data-server/F-7 evolution-data-server-1.10.3.1-fix-64bit-acinclude.patch, NONE, 1.1 evolution-data-server.spec, 1.169, 1.170

[Matthew Barnes (mbarnes)]

Author: mbarnes

Update of /cvs/pkgs/rpms/evolution-data-server/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29551

Modified Files:
	evolution-data-server.spec 
Added Files:
	evolution-data-server-1.10.3.1-fix-64bit-acinclude.patch 
Log Message:

* Tue Jul 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.3.1-2.fc7
- Add patch for RH bug #243296 (fix LDAP configuration).


evolution-data-server-1.10.3.1-fix-64bit-acinclude.patch:

--- NEW FILE evolution-data-server-1.10.3.1-fix-64bit-acinclude.patch ---
--- evolution-data-server-1.10.3.1/acinclude.m4.fix-64bit-acinclude	2007-07-17 11:47:25.000000000 -0400
+++ evolution-data-server-1.10.3.1/acinclude.m4	2007-07-17 11:47:31.000000000 -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}")
+
+	AC_MSG_CHECKING(for multilib subdirectory)
+	if test "$GCC" = "yes" ; then
+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
+	fi
+	multilibsubdir=${multilibsubdir:-.}
+	AC_MSG_RESULT($multilibsubdir)
+	AC_MSG_CHECKING(for lib subdirectory)
+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
+	libsubdir=${libsubdir:-lib}
+	AC_MSG_RESULT($libsubdir)
+
 	case $ac_cv_with_openldap in
 	no|"")
 		with_openldap=no
@@ -44,7 +56,7 @@ AC_DEFUN([EVO_LDAP_CHECK], [
 	*)
 		with_openldap=$ac_cv_with_openldap
 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
-		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
 		;;
 	esac
 
@@ -80,20 +92,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"
+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
 
 				# libldap might depend on OpenSSL... We need to pull
 				# in the dependency libs explicitly here since we're
 				# not using libtool for the configure test.
-				if test -f $with_openldap/lib/libldap.la; then
-					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
+				if test -f $with_openldap/$libsubdir/libldap.la; then
+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
 				fi
 			else
 				LDAP_LIBS="-llber $LDAP_LIBS"
 			fi
 			AC_CHECK_LIB(ldap, ldap_open, [
 					if test $with_static_ldap = "yes"; then
-						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
 					else
 						LDAP_LIBS="-lldap $LDAP_LIBS"
 					fi],


Index: evolution-data-server.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-data-server/F-7/evolution-data-server.spec,v
retrieving revision 1.169
retrieving revision 1.170
diff -u -r1.169 -r1.170
--- evolution-data-server.spec	3 Jul 2007 15:16:14 -0000	1.169
+++ evolution-data-server.spec	17 Jul 2007 15:51:31 -0000	1.170
@@ -26,7 +26,7 @@
 
 Name: evolution-data-server
 Version: 1.10.3.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -81,6 +81,9 @@
 # RH bug #215634
 Patch24: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
 
+# RH bug #243296
+Patch25: evolution-data-server-1.10.3-fix-64bit-include.patch
+
 ### Dependencies ###
 
 Requires: GConf2
@@ -175,6 +178,7 @@
 %patch22 -p1 -b .code-cleanup
 %patch23 -p1 -b .camel-folder-symmary-crash
 %patch24 -p1 -b .camel-certdb-nss-cert-get
+%patch25 -p1 -b .fix-64bit-include
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -263,6 +267,14 @@
 	-Werror-implicit-function-declaration"
 %endif
 
+# Regenerate configure to pick up acinclude.m4 changes.
+aclocal
+autoheader
+automake
+libtoolize
+intltoolize --force
+autoconf
+
 # See Ross Burton's blog entry for why we want --with-libdb.
 # http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
 
@@ -392,6 +404,9 @@
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Tue Jul 17 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.3.1-2.fc7
+- Add patch for RH bug #243296 (fix LDAP configuration).
+
 * Mon Jul 03 2007 Matthew Barnes <mbarnes at redhat.com> - 1.10.3.1-1.fc7
 - Update to 1.10.3.1
 - Remove patch for RH bug #244283 (fixed upstream).