[ffgtk: 4/5] Re-enabled plugin-evolution

[Louis Lagendijk]

commit 289ff97313bcb28175f9bae29182db93d7284b35
Author: Louis Lagendijk <louis.lagendijk at gmail.com>
Date:   Tue Jul 31 00:56:17 2012 +0200

    Re-enabled plugin-evolution

 ffgtk.spec |   29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)
---
diff --git a/ffgtk.spec b/ffgtk.spec
index 3ef50d2..c2ab61a 100644
--- a/ffgtk.spec
+++ b/ffgtk.spec
@@ -1,6 +1,6 @@
 Name:           ffgtk
 Version:        0.8.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        A solution for controlling Fritz!Box or compatible routers
 Group:          Applications/Communications
 License:        GPLv2
@@ -8,6 +8,7 @@ URL:            http://www.tabos.org/ffgtk/
 Source0:        http://www.tabos.org/ffgtk/download/%{name}-%{version}.tar.bz2
 Source1:        ffgtk-README.Fedora
 Patch1:         ffgtk-0.8.3-use-old-spooler.patch
+Patch2:         ffgtk-0.8.3-evolution-dataserver-sources.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -25,8 +26,6 @@ Requires(postun):/usr/sbin/lpadmin
 # The gstreamer plugin is dropped, the capifax functionality is included in the main package now
 Obsoletes:      ffgtk-plugin-gstreamer < 0.8.3-1
 Obsoletes:	ffgtk-plugin-capifax < 0.8.3-1
-# For now, remove the evolution plugin
-Obsoletes:	ffgtk-plugin-evolution 0.8.3-1
 
 %description
 Fritz Fun (ffgtk) is a clean solution for controlling the FRITZ!Box or 
@@ -35,12 +34,12 @@ monitor and fax support. It offers integration with the KDE, evolution and
 Thurderbird address books.
 Some plug-ins are packaged separately.
 
-#%package plugin-evolution
-#Summary:        Evolution address book plugin for ffgtk
-#Requires:       %{name} = %{version}-%{release}
+%package plugin-evolution
+Summary:        Evolution address book plugin for ffgtk
+Requires:       %{name} = %{version}-%{release}
 
-#%description plugin-evolution
-#This package contains the evolution address book plugin for ffgtk.
+%description plugin-evolution
+This package contains the evolution address book plugin for ffgtk.
 
 %package plugin-google-addressbook
 Summary:        Google addressbook plugin for ffgtk (BETA)
@@ -53,13 +52,12 @@ This plugin has beta quality
 %prep
 %setup -q
 %patch1 -p0 -b .use-old-spooler
+%patch2 -p1 -b .dataserver.patch
 install -m644 %{SOURCE1} ./README.Fedora
 
 %build
 ./autogen.sh
-# work around for broken spandsp pkconfig file
-# Exclude the evol plugin for now as it doen not compile
-%configure -with-portaudio=no --with-spandsp=/usr --disable-Werror --with-ebook=no
+%configure -with-portaudio=no --disable-Werror
 make %{?_smp_mflags} 
 
 %install
@@ -148,15 +146,18 @@ fi
 %{_datarootdir}/cups/model/ffgtk-fax.ppd
 %doc README AUTHORS ChangeLog COPYING README.Fedora 
 
-#%files plugin-evolution 
-#%defattr(-,root,root,-)
-#%{_libdir}/ffgtk/plugins/lib_ab_ebook.so
+%files plugin-evolution 
+%defattr(-,root,root,-)
+%{_libdir}/ffgtk/plugins/lib_ab_ebook.so
 
 %files plugin-google-addressbook
 %defattr(-,root,root,-)
 %{_libdir}/ffgtk/plugins/lib_ab_google.so
 
 %changelog
+* Tue Jul 31 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-3
+- Add patch for new evolution dataserver interface
+
 * Mon Jul 30 2012  Louis Lagendijk <louis.lagendijk at gmail.com> 0.8.3-2
 - Fix BZ 844149:  Faxing via logical ffgtk-fax printer broken in ffgtk-0.8.3 package