[packages/abiword] - fix building with current evolution-data-server

[baggins]

commit 1cc51ce6a70a8b5ae7a0014c9d4b35aaac23b1ff
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Oct 18 21:52:07 2014 +0200

    - fix building with current evolution-data-server

 abiword.spec       | 11 ++++-------
 eds-libebook.patch | 11 +++++++++++
 2 files changed, 15 insertions(+), 7 deletions(-)
---
diff --git a/abiword.spec b/abiword.spec
index 776a2aa..139d3e7 100644
--- a/abiword.spec
+++ b/abiword.spec
@@ -24,6 +24,7 @@ Source0:	http://www.abisource.com/downloads/abiword/%{version}/source/%{name}-%{
 # Source0-md5:	8d9c41cff3a8fbef8d0c835c65600e65
 Patch0:		%{name}-desktop.patch
 Patch1:		%{name}-mht.patch
+Patch2:		eds-libebook.patch
 URL:		http://www.abisource.com/
 BuildRequires:	aiksaurus-gtk-devel >= 1.2.1
 BuildRequires:	autoconf
@@ -33,6 +34,7 @@ BuildRequires:	bzip2-devel
 BuildRequires:	cairo-devel
 BuildRequires:	enchant-devel >= 1.2.6
 BuildRequires:	eps-devel
+BuildRequires:	evolution-data-server-devel
 BuildRequires:	fontconfig-devel >= 1:2.3.95
 BuildRequires:	fribidi-devel >= 0.10.4
 BuildRequires:	glib2-devel >= 1:2.12.1
@@ -318,6 +320,7 @@ Jest to teczka clipartów używanych przez AbiWorda.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__aclocal} -I .
@@ -329,13 +332,7 @@ Jest to teczka clipartów używanych przez AbiWorda.
 	--disable-static \
 	--enable-clipart \
 	--enable-plugins=auto \
-	--enable-printing \
-	--enable-scripting \
-	--enable-templates \
-	--enable-threads \
-	--with-libxml2 \
-	--with-pspell \
-	--with-sys-wv
+	--enable-templates
 
 %{__make}
 
diff --git a/eds-libebook.patch b/eds-libebook.patch
new file mode 100644
index 0000000..36002f1
--- /dev/null
+++ b/eds-libebook.patch
@@ -0,0 +1,11 @@
+--- abiword-3.0.0/src/text/ptbl/xp/pd_DocumentRDF.cpp~	2013-04-07 15:53:03.000000000 +0200
++++ abiword-3.0.0/src/text/ptbl/xp/pd_DocumentRDF.cpp	2014-10-18 21:41:42.371972410 +0200
+@@ -1884,7 +1884,7 @@
+ 
+ #ifdef WITH_EVOLUTION_DATA_SERVER
+ extern "C" {
+-  #include <libebook/e-book.h>
++  #include <libebook/libebook.h>
+ };
+ 
+ static std::string get( EVCard* c, const char* v )
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/abiword.git/commitdiff/1cc51ce6a70a8b5ae7a0014c9d4b35aaac23b1ff