From e5b7a455a6b23fa90a460f4c95d98dc016bb80b0 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 16 Mar 2015 12:14:48 +0100
Subject: [PATCH] Update to 3.15.92; Remove patch to fix libdb configure.ac
 check (fixed upstream)

---
 .gitignore                                    |  1 +
 ...a-server-3.15.91-libdb-configure-fix.patch | 28 -------------------
 evolution-data-server.spec                    |  9 +++---
 sources                                       |  2 +-
 4 files changed, 7 insertions(+), 33 deletions(-)
 delete mode 100644 evolution-data-server-3.15.91-libdb-configure-fix.patch

diff --git a/.gitignore b/.gitignore
index b63d790..59bcb48 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,4 @@ evolution-data-server-2.31.5.tar.bz2
 /evolution-data-server-3.13.10.tar.xz
 /evolution-data-server-3.13.90.tar.xz
 /evolution-data-server-3.15.91.tar.xz
+/evolution-data-server-3.15.92.tar.xz
diff --git a/evolution-data-server-3.15.91-libdb-configure-fix.patch b/evolution-data-server-3.15.91-libdb-configure-fix.patch
deleted file mode 100644
index 0d45794..0000000
--- a/evolution-data-server-3.15.91-libdb-configure-fix.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -up evolution-data-server-3.15.91/configure.ac.ttest evolution-data-server-3.15.91/configure.ac
---- evolution-data-server-3.15.91/configure.ac.ttest	2015-03-02 11:48:25.422252070 +0100
-+++ evolution-data-server-3.15.91/configure.ac	2015-03-02 11:49:28.947798814 +0100
-@@ -634,18 +634,18 @@ AC_ARG_WITH([libdb],
- 
- if test "x$with_libdb" != "xno" ; then
- 	if test "x$with_libdb" != "xyes" ; then
--		DB_CFLAGS="-I$with_libdb/include"
--		DB_LIBS="-L$with_libdb/lib -ldb"
-+		DB_CFLAGS="$CFLAGS -I$with_libdb/include"
-+		DB_LIBS="$LIBS -L$with_libdb/lib -ldb"
- 	else
- 		if test -z "$DB_CFLAGS" -a -z "$DB_LIBS"; then
--			DB_CFLAGS=""
--			DB_LIBS="-ldb"
-+			DB_CFLAGS="$CFLAGS"
-+			DB_LIBS="$LIBS -ldb"
- 		fi
- 	fi
- 
- 	AC_MSG_CHECKING([Berkeley DB])
--	save_cflags=$CFLAGS; CFLAGS=$DB_CFLAGS
--	save_libs=$LIBS; LIBS="$DB_LIBS"
-+	save_cflags=$CFLAGS; CFLAGS="$CFLAGS $DB_CFLAGS"
-+	save_libs=$LIBS; LIBS="$LIBS $DB_LIBS"
- 	AC_LINK_IFELSE([AC_LANG_PROGRAM(
- 		[[#include <db.h>]],
- 		[[db_create(NULL, NULL, 0)]])],
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index f833a42..ef711cf 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -32,7 +32,7 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.15.91
+Version: 3.15.92
 Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -54,8 +54,6 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
-Patch02: evolution-data-server-3.15.91-libdb-configure-fix.patch
-
 ### Dependencies ###
 
 Requires: dconf
@@ -152,7 +150,6 @@ the functionality of the installed %{name} package.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
-%patch02 -p1 -b .libdb-configure-fix
 
 %build
 %if %{ldap_support}
@@ -413,6 +410,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Mar 16 2015 Milan Crha <mcrha@redhat.com> - 3.15.92-1
+- Update to 3.15.92
+- Remove patch to fix libdb configure.ac check (fixed upstream)
+
 * Mon Mar 02 2015 Milan Crha <mcrha@redhat.com> - 3.15.91-1
 - Update to 3.15.91
 - Add patch to fix libdb configure.ac check
diff --git a/sources b/sources
index 8a1cf49..4757d5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d5bd27ad1b1a16e9e5d88898e50cf2bc  evolution-data-server-3.15.91.tar.xz
+89bc38a07c56162f6cf25037f35fa52a  evolution-data-server-3.15.92.tar.xz