From 9cfb516045cd65fd1d3138e5a5035c0f2c889c71 Mon Sep 17 00:00:00 2001
From: Caolan McNamara <caolanm@fedoraproject.org>
Date: May 13 2008 14:18:13 +0000
Subject: make future proof


---

diff --git a/planner-0.13-enableeds.patch b/planner-0.13-enableeds.patch
index d8ae5ca..a5639bc 100644
--- a/planner-0.13-enableeds.patch
+++ b/planner-0.13-enableeds.patch
@@ -1,27 +1,16 @@
 --- planner-0.13/configure.in.eds	2006-02-06 09:50:51.000000000 +0000
 +++ planner-0.13/configure.in	2006-02-06 09:51:11.000000000 +0000
-@@ -279,18 +279,20 @@
- if test "x$enable_eds_backend" = "xyes" ; then
-     EDS_REQUIRED=1.1.0 
-     EDS_PACKAGE=1.2
--    EVOLUTION_PACKAGE=2.2
-+    EVOLUTION_PACKAGE=2.12
-     EVOLUTION_REQUIRED=2.1.3
-     PKG_CHECK_MODULES(EDS_BACKEND, 
-     [
+@@ -289,11 +289,11 @@
  		libecal-$EDS_PACKAGE >= $EDS_REQUIRED
      		libedata-cal-$EDS_PACKAGE >= $EDS_REQUIRED
      		libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED
 -    		evolution-plugin-$EVOLUTION_PACKAGE >= $EVOLUTION_REQUIRED
 +    		evolution-plugin >= $EVOLUTION_REQUIRED
      ])
--    extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
-+    extensiondir="\${libdir}/evolution-data-server-$EDS_PACKAGE/extensions"
-+#    extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
+     extensiondir=`$PKG_CONFIG --variable=extensiondir evolution-data-server-$EDS_PACKAGE`
      AC_SUBST(extensiondir)
 -    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
-+    plugindir="\${libdir}/evolution/$EVOLUTION_PACKAGE/plugins"
-+#    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin-$EVOLUTION_PACKAGE`
++    plugindir=`$PKG_CONFIG --variable=plugindir evolution-plugin`
      AC_SUBST(plugindir)
      use_eds_backend=yes
  else
diff --git a/planner.spec b/planner.spec
index 8696f82..2ef9dc2 100644
--- a/planner.spec
+++ b/planner.spec
@@ -55,7 +55,7 @@ This package provides a plugin to integration planner and evolution.
 %prep
 %setup -q
 %patch0 -p1 -b .desktop-fix
-#%patch1 -p1 -b .enableeds
+%patch1 -p1 -b .enableeds
 %patch2 -p0 -b .ganttheight
 
 %build
@@ -82,7 +82,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/python*/site-packages/gtk-2.0/*.la
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/storage-modules/libstorage-sql*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/%{name}/plugins/libsql-plugin*
 rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server-1.2/extensions/*.la
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/2.12/plugins/*.la
+rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution/*/plugins/*.la
 
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/XMLnamespaces
 rm -f $RPM_BUILD_ROOT/%{_datadir}/mime/globs
@@ -140,11 +140,8 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_libdir}/evolution-data-server-1.2
 %dir %{_libdir}/evolution-data-server-1.2/extensions
 %{_libdir}/evolution-data-server-1.2/extensions/libecalbackendplanner.*
-%dir %{_libdir}/evolution
-%dir %{_libdir}/evolution/2.12
-%dir %{_libdir}/evolution/2.12/plugins
-%{_libdir}/evolution/2.12/plugins/liborg-gnome-planner-source.so
-%{_libdir}/evolution/2.12/plugins/org-gnome-planner-source.eplug
+%{_libdir}/evolution/*/plugins/liborg-gnome-planner-source.so
+%{_libdir}/evolution/*/plugins/org-gnome-planner-source.eplug
 
 %files devel
 %defattr(-,root,root)