From 56bff4c71ce4a70984c5b2a2ec057cfb9685efe9 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Mon, 31 Jul 2006 19:48:55 +0000
Subject: [PATCH] - Revert to version 1.7.4 to prevent API/ABI breakage. - Add
 back patch to make --with-libdb configure option work.

---
 .cvsignore                 |  2 +-
 evolution-data-server.spec | 16 ++++++++++++----
 sources                    |  2 +-
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 4d42394..3210d48 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-evolution-data-server-1.7.90.1.tar.bz2
+evolution-data-server-1.7.4.tar.bz2
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index f14a7df..9d99406 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -21,8 +21,8 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 1.7.90.1
-Release: 4
+Version: 1.7.4
+Release: 3
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -43,8 +43,11 @@ Patch15: gb-309079-attach-48377.patch
 
 Patch16: evolution-data-server-1.5.4-make_imap4_optional.patch
 
+# Gnome.org bug #344693
+Patch17: evolution-data-server-1.7.4-with-libdb-fix.patch
+
 # Gnome.org bug #348725
-Patch17: evolution-data-server-1.7.90.1-missing-function-decl.patch
+#Patch18: evolution-data-server-1.7.90.1-missing-function-decl.patch
 
 ### Dependencies ###
 
@@ -128,7 +131,8 @@ evolution-data-server.
 %patch14 -p0 -b .fix-uid-leak
 %patch15 -p0 -b .fix-comp-ref-leak
 %patch16 -p1 -b .make_imap4_optional
-%patch17 -p1 -b .missing-function-decl
+%patch17 -p1 -b .with-libdb-fix
+#%patch18 -p1 -b .missing-function-decl
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -331,6 +335,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libexchange-storage-%{eds_api_version}.pc
 
 %changelog
+* Mon Jul 31 2006 Matthew Barnes <mbarnes@redhat.com> - 1.7.4-3
+- Revert to version 1.7.4 to prevent API/ABI breakage.
+- Add back patch to make --with-libdb configure option work.
+
 * Mon Jul 31 2006 Ray Strode <rstrode@redhat.com> - 1.7.90.1-4
 - add executable bits to libs 
 
diff --git a/sources b/sources
index fa1e66a..57677dd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-07fa3db5725d41093b22d4e90c2ced87  evolution-data-server-1.7.90.1.tar.bz2
+b992845da75badd6eb5fecea022b5a50  evolution-data-server-1.7.4.tar.bz2