rpms/evolution-exchange/devel evolution-exchange-2.10.1-fix-64bit-acinclude.patch, NONE, 1.1 evolution-exchange.spec, 1.84, 1.85 evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch, 1.2, NONE evolution-exchange-2.29.3-add-ldap-libs.patch, 1.3, NONE

[Milan Crha]

Author: mcrha

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

Modified Files:
	evolution-exchange.spec 
Added Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.patch 
Removed Files:
	evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch 
	evolution-exchange-2.29.3-add-ldap-libs.patch 
Log Message:
Let it build finally.


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

--- NEW FILE evolution-exchange-2.10.1-fix-64bit-acinclude.patch ---
diff -up evolution-exchange-2.29.3/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-exchange-2.29.3/m4/evo_ldap_check.m4
--- evolution-exchange-2.29.3/m4/evo_ldap_check.m4.fix-64bit-acinclude	2009-11-30 10:45:51.000000000 +0100
+++ evolution-exchange-2.29.3/m4/evo_ldap_check.m4	2009-12-02 10:49:15.000000000 +0100
@@ -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
+		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
@@ -24,7 +36,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
 
@@ -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"
+				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-exchange.spec
===================================================================
RCS file: /cvs/pkgs/rpms/evolution-exchange/devel/evolution-exchange.spec,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -p -r1.84 -r1.85
--- evolution-exchange.spec	1 Dec 2009 17:39:35 -0000	1.84
+++ evolution-exchange.spec	2 Dec 2009 10:02:44 -0000	1.85
@@ -30,9 +30,7 @@ Obsoletes: evolution-connector < %{versi
 
 ### Patches ###
 
-Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch
-Patch12: evolution-exchange-2.29.3-add-ldap-libs.patch
-
+Patch11: evolution-exchange-2.10.1-fix-64bit-acinclude.patch
 ### Dependencies ###
 
 Requires: gnutls
@@ -54,6 +52,10 @@ BuildRequires: libsoup-devel >= %{libsou
 BuildRequires: libtool >= 1.5
 BuildRequires: openldap-evolution-devel
 BuildRequires: openssl-devel
+BuildRequires: krb5-devel 
+# tweak for krb5 1.2 vs 1.3
+%define krb5dir /usr/kerberos
+#define krb5dir `pwd`/krb5-fakeprefix
 
 %description
 This package enables added functionality to Evolution when used with a 
@@ -62,8 +64,11 @@ Microsoft Exchange Server.
 %prep
 %setup -q -n evolution-exchange-%{version}
 
-%patch11 -p1 -b .fix-64bit-acinclude.m4
-%patch12 -p1 -b .add-ldap-libs
+%patch11 -p1 -b .fix-64bit-acinclude
+
+mkdir -p krb5-fakeprefix/include
+mkdir -p krb5-fakeprefix/lib
+mkdir -p krb5-fakeprefix/%{_lib}
 
 %build
 export CPPFLAGS="-I%{_includedir}/et"
@@ -83,7 +88,8 @@ autoreconf --force --install
 %configure \
   --enable-gtk-doc \
   --with-openldap=%{_libdir}/evolution-openldap \
-  --with-static-ldap
+  --with-static-ldap \
+  --with-krb5=%{krb5dir}
 
 make %{?_smp_mflags} LDFLAGS="-R %{plibdir}"
 
@@ -117,7 +123,7 @@ gconftool-2 --makefile-install-rule %{_s
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendexchange.so
 %{_libdir}/evolution/%{evo_major}/plugins/liborg-gnome-exchange-operations.so
 %{_libdir}/evolution/%{evo_major}/plugins/org-gnome-exchange-operations.eplug
-%{_libdir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
+%{_datadir}/evolution/%{evo_major}/errors/org-gnome-exchange-operations.error
 
 %{_datadir}/gtk-doc/html/evolution-exchange
 %dir %{_datadir}/evolution-exchange


--- evolution-exchange-2.10.1-fix-64bit-acinclude.m4.patch DELETED ---


--- evolution-exchange-2.29.3-add-ldap-libs.patch DELETED ---