[evolution-rss] Update a patch for evolution 3.11.91 changes (the previous was not enough)

[Milan Crha]

commit c41faa81608ac2f162d8ca256128e18a2d643daa
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Mar 3 14:35:06 2014 +0100

    Update a patch for evolution 3.11.91 changes (the previous was not enough)

 evo-3.11.91-changes.patch |   68 ++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 4 deletions(-)
---
diff --git a/evo-3.11.91-changes.patch b/evo-3.11.91-changes.patch
index 05cc260..f6808ed 100644
--- a/evo-3.11.91-changes.patch
+++ b/evo-3.11.91-changes.patch
@@ -1,11 +1,71 @@
-diff -up evolution-rss-0.3.94/configure.ac.evo-3.11.91 evolution-rss-0.3.94/configure.ac
---- evolution-rss-0.3.94/configure.ac.evo-3.11.91	2014-03-03 13:47:33.482903365 +0100
-+++ evolution-rss-0.3.94/configure.ac	2014-03-03 13:49:34.855898222 +0100
-@@ -96,7 +96,6 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
+diff --git a/configure.ac b/configure.ac
+index 1439a85..cf034b0 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -92,11 +92,17 @@ if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
+ 	EVOLUTION_ADDITIONAL="libemail-engine"
+ fi
+ 
++EVOLUTION_PLUGIN_CHECK="evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED"
++
++if test "$evolution_version_int" -ge "31191"; then
++	EVOLUTION_PLUGIN_CHECK=
++fi
++
+ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
  [  glib-2.0 >= $LIBGLIB_REQUIRED dnl
     gtk+-$LIBGTK_VERSION.0 >= $LIBGTK_REQUIRED dnl
     libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
 -   evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
++   $EVOLUTION_PLUGIN_CHECK dnl
     evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
     $EVOLUTION_ADDITIONAL dnl
     libebook-1.2 dnl
+diff --git a/m4/evolution.m4 b/m4/evolution.m4
+index 2aba701..da07a5a 100644
+--- a/m4/evolution.m4
++++ b/m4/evolution.m4
+@@ -78,10 +78,17 @@ AC_SUBST(MINOR_VERSION)
+ dnl Evolution plugin install directory
+ AC_ARG_WITH(plugin-install-dir, [  --with-plugin-install-dir=PATH path to evolution plugin directory])
+ if test "x$with_plugin_install_dir" = "x"; then
+-        PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
+-        if test "x$PLUGIN_INSTALL_DIR" = "x"; then
+-                AC_MSG_ERROR(Unable to find plugin directory)
+-                break;
++	if test "$evolution_version_int" -ge "031191"; then
++		PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-shell$EVOLUTION_BASE_VERSION_S`
++		if test "x$PLUGIN_INSTALL_DIR" = "x"; then
++			PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=privlibdir evolution-shell$EVOLUTION_BASE_VERSION_S`/plugins
++		fi
++	else
++		PLUGIN_INSTALL_DIR=`$PKG_CONFIG --variable=plugindir evolution-plugin$EVOLUTION_BASE_VERSION_S`
++		if test "x$PLUGIN_INSTALL_DIR" = "x"; then
++			AC_MSG_ERROR(Unable to find plugin directory)
++			break;
++		fi
+         fi
+ fi
+ AC_SUBST(PLUGIN_INSTALL_DIR)
+@@ -97,7 +104,11 @@ fi
+ AC_SUBST(ICON_DIR)
+ 
+ dnl Evolution e-error install directory
+-ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
++if test "$evolution_version_int" -ge "031191"; then
++	ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-shell$EVOLUTION_BASE_VERSION_S`
++else
++	ERROR_DIR=`$PKG_CONFIG --variable=errordir evolution-plugin$EVOLUTION_BASE_VERSION_S`
++fi
+ if test "x$ERROR_DIR" = "x"; then
+    AC_MSG_ERROR(Unable to find error file directory)
+ fi
+@@ -107,7 +118,7 @@ dnl test required for bonobo server installation
+ dnl dnl user might specify wrong prefix or not specify at all
+ AC_ARG_WITH(bonobo-servers-dir, [  --with-bonobo-servers-dir=PATH path to bonobo servers directory])
+ if test "x$with_bonobo_servers_dir" = "x" ; then
+-    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-plugin$EVOLUTION_BASE_VERSION_S`
++    BONOBO_LIBDIR=`$PKG_CONFIG --variable=libdir evolution-shell$EVOLUTION_BASE_VERSION_S`
+     if test "x$BONOBO_LIBDIR" = "x"; then
+        AC_MSG_ERROR(Unable to find bonobo servers file directory)
+     fi