[evolution-rss] Add a patch to adapt to evolution's changed folder structure
Milan Crha
mcrha at fedoraproject.org
Mon Sep 22 15:12:10 UTC 2014
commit c9aa16141b2c639c03ed07a2a79961f32d83e579
Author: Milan Crha <mcrha at redhat.com>
Date: Mon Sep 22 17:12:23 2014 +0200
Add a patch to adapt to evolution's changed folder structure
evo-3.13.6-changes.patch | 25 +++++++++++++++++++++++++
evolution-rss.spec | 2 ++
2 files changed, 27 insertions(+), 0 deletions(-)
---
diff --git a/evo-3.13.6-changes.patch b/evo-3.13.6-changes.patch
new file mode 100644
index 0000000..77a27da
--- /dev/null
+++ b/evo-3.13.6-changes.patch
@@ -0,0 +1,25 @@
+diff -up evolution-rss-0.3.94/configure.ac.evo-3.13.6-changes evolution-rss-0.3.94/configure.ac
+--- evolution-rss-0.3.94/configure.ac.evo-3.13.6-changes 2014-09-22 16:06:52.113489356 +0200
++++ evolution-rss-0.3.94/configure.ac 2014-09-22 16:07:13.247488518 +0200
+@@ -377,13 +377,21 @@ serverdir="$BONOBO_LIBDIR/bonobo/servers
+ AC_SUBST(serverdir)
+ fi
+
++if test $evolution_int_version -ge 31306; then
++privdatadir='${datadir}'/evolution
++else
+ privdatadir='${datadir}'/evolution/$EVOLUTION_EXEC_VERSION
++fi
+ AC_SUBST(privdatadir)
+
+ uidir="$privdatadir/ui"
+ AC_SUBST(uidir)
+
++if test $evolution_int_version -ge 31306; then
++privlibdir=`$PKG_CONFIG --variable=privlibdir evolution-shell-3.0`
++else
+ privlibdir='${libdir}'/evolution/$EVOLUTION_EXEC_VERSION
++fi
+ AC_SUBST(privlibdir)
+
+ moduledir="$privlibdir/modules"
diff --git a/evolution-rss.spec b/evolution-rss.spec
index 2b3baba..66e1549 100644
--- a/evolution-rss.spec
+++ b/evolution-rss.spec
@@ -23,6 +23,7 @@ Patch04: evo-3.11.91-changes.patch
Patch05: rss-runtime.patch
Patch06: evolution-rss-0.3.94-metainfo-file.patch
Patch07: evolution-rss-0.3.94-message-presend.patch
+Patch08: evo-3.13.6-changes.patch
Requires(pre): GConf2
Requires(post): GConf2
@@ -52,6 +53,7 @@ This is an evolution plugin which enables evolution to read rss feeds.
%patch05 -p1 -b .rss-runtime
%patch06 -p1 -b .metainfo-file
%patch07 -p1 -b .message-presend
+%patch08 -p1 -b .evo-3.13.6-changes
%build
autoreconf --force --install
More information about the scm-commits
mailing list