rpms/evolution-data-server
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Add patch for RH bug #243296 (fix LDAP configuration).

Browse Source
This commit is contained in:
Matthew Barnes 2007-07-17 15:21:30 +00:00
parent 88831bbbab
commit 1c8c13ac57
2 changed files with 71 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
evolution-data-server-1.11.5-fix-64bit-acinclude.patch Normal file
View File

@ -0,0 +1,55 @@
--- evolution-data-server-1.11.5/acinclude.m4.fix-64bit-acinclude 2007-07-17 10:45:02.000000000 -0400
+++ evolution-data-server-1.11.5/acinclude.m4 2007-07-17 10:45:15.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],

17
evolution-data-server.spec
View File

@ -26,7 +26,7 @@
Name: evolution-data-server
Version: 1.11.5
Release: 1%{?dist}
Release: 2%{?dist}
License: LGPL
Group: System Environment/Libraries
Summary: Backend data server for Evolution
@ -63,6 +63,9 @@ Patch19: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #215634
Patch20: evolution-data-server-1.10.1-camel-certdb-nss-cert-get.patch
# RH bug #243296
Patch21: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
### Dependencies ###
Requires: GConf2
@ -151,6 +154,7 @@ evolution-data-server.
%patch18 -p1 -b .code-cleanup
%patch19 -p1 -b .camel-folder-symmary-crash
%patch20 -p1 -b .camel-certdb-nss-cert-get
%patch21 -p1 -b .fix-64bit-acinclude
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@ -245,6 +249,14 @@ CFLAGS="$CFLAGS \
-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
@ -375,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
%changelog
* Tue Jul 17 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.5-2.fc8
- Add patch for RH bug #243296 (fix LDAP configuration).
* Mon Jul 09 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.5-1.fc8
- Update to 1.11.5