Worked, remove the patch for real.

This commit is contained in:
Matthew Barnes 2008-02-14 19:19:56 +00:00
parent 51a85f5f39
commit 8229856bc1
2 changed files with 14 additions and 28 deletions

View File

@ -1,11 +0,0 @@
--- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400
+++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400
@@ -12135,7 +12135,7 @@
echo $ECHO_N "(cached) $ECHO_C" >&6
else
ac_check_lib_save_LIBS=$LIBS
-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS"
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
/* confdefs.h. */

View File

@ -37,28 +37,26 @@ Source: %{name}-%{version}.tar.bz2
### Patches ###
Patch10: evolution-data-server-1.4.4-ldap-x86_64-hack.patch
# Remove gnome-common macros from configure.in.
Patch11: evolution-data-server-1.8.0-no-gnome-common.patch
Patch10: evolution-data-server-1.8.0-no-gnome-common.patch
# RH bug #202309
Patch12: evolution-data-server-1.7.91-maybe-fix-crash.patch
Patch11: evolution-data-server-1.7.91-maybe-fix-crash.patch
# RH bug #215702 / GNOME bug #487988
Patch13: evolution-data-server-1.8.0-fix-ldap-query.patch
Patch12: evolution-data-server-1.8.0-fix-ldap-query.patch
# GNOME bug #373146
Patch14: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
Patch13: evolution-data-server-1.10.1-camel-folder-summary-crash.patch
# RH bug #243296
Patch15: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
# GNOME bug #516074
Patch16: evolution-data-server-2.21.91-netdb-breakage.patch
Patch15: evolution-data-server-2.21.91-netdb-breakage.patch
# G_GNUC_PRETTY_FUNCTION is deprecated
Patch17: evolution-data-server-2.21.91-no-gnuc-pretty-function.patch
Patch16: evolution-data-server-2.21.91-no-gnuc-pretty-function.patch
### Build Dependencies ###
@ -132,14 +130,13 @@ This package contains developer documentation for %{name}.
%prep
%setup -q
#%patch10 -p1 -b .ldaphack
%patch11 -p1 -b .no-gnome-common
%patch12 -p1 -b .maybe-fix-crash
%patch13 -p1 -b .fix-ldap-query
%patch14 -p1 -b .camel-folder-summary-crash
%patch15 -p1 -b .fix-64bit-acinclude
%patch16 -p1 -b .netdb-breakage
%patch17 -p1 -b .no-gnuc-pretty-function
%patch10 -p1 -b .no-gnome-common
%patch11 -p1 -b .maybe-fix-crash
%patch12 -p1 -b .fix-ldap-query
%patch13 -p1 -b .camel-folder-summary-crash
%patch14 -p1 -b .fix-64bit-acinclude
%patch15 -p1 -b .netdb-breakage
%patch16 -p1 -b .no-gnuc-pretty-function
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib