- Update to 1.11.6.1

evolution-data-server-1.11.6.1-include-breakage.patch

@@ -1,22 +0,0 @@
---- evolution-data-server-1.11.6.1/libedataserver/e-db3-utils.c.include-breakage	2007-07-30 09:58:54.000000000 -0400
-+++ evolution-data-server-1.11.6.1/libedataserver/e-db3-utils.c	2007-08-01 15:17:25.000000000 -0400
-@@ -14,7 +14,7 @@
- #include <glib.h>
- #include <glib/gstdio.h>
- 
--#include "db.h"
-+#include <db.h>
- 
- #include "e-db3-utils.h"
- 
---- evolution-data-server-1.11.6.1/libedataserver/e-dbhash.c.include-breakage	2007-01-03 09:56:27.000000000 -0500
-+++ evolution-data-server-1.11.6.1/libedataserver/e-dbhash.c	2007-08-01 15:17:25.000000000 -0400
-@@ -12,7 +12,7 @@
- 
- #include <string.h>
- #include <fcntl.h>
--#include "db.h"
-+#include <db.h>
- #include "md5-utils.h"
- 
- struct _EDbHashPrivate 

evolution-data-server.spec

@@ -66,9 +66,6 @@ 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
 
-# Fix some include breakage in 1.11.6.1
-Patch22: evolution-data-server-1.11.6.1-include-breakage.patch
-
 ### Dependencies ###
 
 Requires: GConf2
@@ -158,7 +155,6 @@ evolution-data-server.
 %patch19 -p1 -b .camel-folder-symmary-crash
 %patch20 -p1 -b .camel-certdb-nss-cert-get
 %patch21 -p1 -b .fix-64bit-acinclude
-%patch22 -p1 -b .include-breakage
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -264,9 +260,10 @@ 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
 
+#       --with-libdb=/usr
+
 %configure \
 	%gtkdoc_flags \
-	--with-libdb=/usr \
 	--enable-file-locking=fcntl \
 	--enable-dot-locking=no \
 	%ldap_flags %krb5_flags %nntp_flags %ssl_flags %imap4_flags \
@@ -391,9 +388,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
-* Wed Aug 01 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.6.1-1.fc8
+* Wed Aug 08 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.6.1-1.fc8
 - Update to 1.11.6.1
-- Add patch to fix some <db.h> inclusion breakage.
 
 * Tue Jul 31 2007 Matthew Barnes <mbarnes@redhat.com> - 1.11.6-1.fc8
 - Update to 1.11.6