[evolution-couchdb] Add patch and rebuild against newer evolution-data-server

[Milan Crha]

commit a049be52843ae34ab75ea65052af0477b9d5a971
Author: Milan Crha <mcrha at redhat.com>
Date:   Wed Jan 12 19:27:56 2011 +0100

    Add patch and rebuild against newer evolution-data-server

 eds_2_91_5.patch       |   30 ++++++++++++++++++++++++++++++
 evolution-couchdb.spec |    9 +++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
---
diff --git a/eds_2_91_5.patch b/eds_2_91_5.patch
new file mode 100644
index 0000000..6ef7215
--- /dev/null
+++ b/eds_2_91_5.patch
@@ -0,0 +1,30 @@
+diff -up evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5 evolution-couchdb-0.5.1/addressbook/Makefile.am
+--- evolution-couchdb-0.5.1/addressbook/Makefile.am.eds_2_91_5	2011-01-12 19:18:32.554385617 +0100
++++ evolution-couchdb-0.5.1/addressbook/Makefile.am	2011-01-12 19:18:36.366385787 +0100
+@@ -2,8 +2,8 @@ INCLUDES =						\
+ 	$(EVOLUTION_CFLAGS)				\
+ 	-I$(top_srcdir)
+ 
+-extensiondir = $(EDS_EXTENSION_DIR)
+-extension_LTLIBRARIES = libebookbackendcouchdb.la
++ebook_backenddir = $(EDS_EBOOK_BACKEND_DIR)
++ebook_backend_LTLIBRARIES = libebookbackendcouchdb.la
+ 
+ libebookbackendcouchdb_la_SOURCES =		\
+ 	e-book-backend-couchdb-factory.c	\
+diff -up evolution-couchdb-0.5.1/configure.ac.eds_2_91_5 evolution-couchdb-0.5.1/configure.ac
+--- evolution-couchdb-0.5.1/configure.ac.eds_2_91_5	2011-01-12 19:14:34.842386088 +0100
++++ evolution-couchdb-0.5.1/configure.ac	2011-01-12 19:18:01.509385984 +0100
+@@ -46,10 +46,10 @@ AC_SUBST(EPLUGIN_LIBS)
+ 
+ EDS_API_VERSION=1.2
+ PKG_CHECK_EXISTS(evolution-data-server-1.2,
+-	EDS_EXTENSION_DIR=`$PKG_CONFIG --variable=extensiondir evolution-data-server-1.2`,
++	EDS_EBOOK_BACKEND_DIR=`$PKG_CONFIG --variable=backenddir libedata-book-1.2`,
+ 	AC_MSG_ERROR(You need evolution-data-server to compile evolution-couchdb))				    
+ AC_SUBST(EDS_API_VERSION)
+-AC_SUBST(EDS_EXTENSION_DIR)
++AC_SUBST(EDS_EBOOK_BACKEND_DIR)
+ 
+ PKG_CHECK_EXISTS(evolution-plugin,
+ 	EVOLUTION_PLUGINS_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin`,
diff --git a/evolution-couchdb.spec b/evolution-couchdb.spec
index e9ccfb1..27248d1 100644
--- a/evolution-couchdb.spec
+++ b/evolution-couchdb.spec
@@ -1,12 +1,13 @@
 Name:          evolution-couchdb
 Version:       0.5.1
-Release:       2%{?dist}
+Release:       3%{?dist}
 Summary:       An evolution backend to CouchDBs for PIM information
 
 Group:         System Environment/Libraries
 License:       GPLv3+
 URL:           http://www.gnome.org/
 Source0:       ftp://ftp.gnome.org/pub/gnome/sources/%{name}/0.5/%{name}-%{version}.tar.bz2
+Patch0:        eds_2_91_5.patch
 
 BuildRequires: couchdb-glib-devel
 BuildRequires: dbus-glib-devel
@@ -27,6 +28,7 @@ stored in a CouchDB.
 
 %prep
 %setup -q
+%patch0 -p1 -b .eds_2_91_5
 
 %build
 %configure --disable-static
@@ -54,11 +56,14 @@ done
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc COPYING NEWS
-%{_libdir}/evolution-data-server-1.2/extensions/libebookbackendcouchdb.so
+%{_libdir}/evolution-data-server/addressbook-backends/libebookbackendcouchdb.so
 %{_libdir}/evolution/2.92/plugins/liborg-gnome-evolution-couchdb.so
 %{_libdir}/evolution/2.92/plugins/org-gnome-evolution-couchdb.eplug
 
 %changelog
+* Wed Jan 12 2011 Milan Crha <mcrha at redhat.com> 0.5.1-3
+- Add patch and rebuild against newer evolution-data-server
+
 * Tue Dec 28 2010 Peter Robinson <pbrobinson at gmail.com> 0.5.1-2
 - Bump build