Hello community, here is the log from the commit of package evolution-rss for openSUSE:Factory checked in at 2012-03-01 17:19:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-rss (Old) and /work/SRC/openSUSE:Factory/.evolution-rss.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "evolution-rss", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-rss/evolution-rss.changes 2012-01-09 15:16:26.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.evolution-rss.new/evolution-rss.changes 2012-03-01 17:19:31.000000000 +0100 @@ -1,0 +2,8 @@ +Wed Feb 29 07:29:14 UTC 2012 - vuntz@opensuse.org + +- Add evolution-rss-evo-3.4.patch: commits from git to fix build + with evolution 3.4. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for above patch. + +------------------------------------------------------------------- New: ---- evolution-rss-evo-3.4.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-rss.spec ++++++ --- /var/tmp/diff_new_pack.B3f2bL/_old 2012-03-01 17:19:33.000000000 +0100 +++ /var/tmp/diff_new_pack.B3f2bL/_new 2012-03-01 17:19:33.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + %define _evo_branch %(pkg-config --variable execversion evolution-shell-3.0) %define _evo_plugindir %(pkg-config --variable plugindir evolution-plugin-3.0) %define _evo_errordir %(pkg-config --variable errordir evolution-plugin-3.0) @@ -30,7 +31,11 @@ Group: Productivity/Networking/Email/Clients Url: http://gnome.eu.org/evo/index.php/Evolution_RSS_Reader_Plugin Source: %{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM evolution-rss-evo-3.4.patch vuntz@opensuse.org -- Fix build with evo 3.4, taken from git +Patch0: evolution-rss-evo-3.4.patch BuildRequires: gcc-c++ +# needed for patch0 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: update-desktop-files # Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 @@ -62,8 +67,11 @@ %lang_package -n %{_name} %prep %setup -q +%patch0 -p1 %build +# needed for patch0 +NOCONFIGURE=1 gnome-autogen.sh %configure --disable-schemas-install %__make %{?_smp_mflags} ++++++ evolution-rss-evo-3.4.patch ++++++
From 5bfb98b00894700b8d62e3107fc06cacfb048563 Mon Sep 17 00:00:00 2001 From: Milan Crha
Date: Wed, 08 Feb 2012 09:01:30 +0000 Subject: Be able to build against eds/evo 3.3.4
---
diff --git a/configure.ac b/configure.ac
index 550fffc..2c7f5f1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -79,12 +79,14 @@ LIBGLIB_REQUIRED=2.16.2
LIBGTK_VERSION=2
LIBGTK_REQUIRED=2.12.0
EVOLUTION_REQUIRED=2.4.1
+EVOLUTION_ADDITIONAL=
LIBSOUP_REQUIRED=2.2
if test "$EVOLUTION_BASE_VERSION_S" = "-3.0"; then
LIBGTK_VERSION=3
LIBGTK_REQUIRED=2.99.3
EVOLUTION_REQUIRED=2.91.6
+ EVOLUTION_ADDITIONAL="libemail-utils libemail-engine"
fi
PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
@@ -93,6 +95,7 @@ PKG_CHECK_MODULES(EVOLUTION_RSS_EPLUGIN,
libsoup$SOUP >= $LIBSOUP_REQUIRED dnl
evolution-plugin$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
evolution-shell$EVOLUTION_BASE_VERSION_S >= $EVOLUTION_REQUIRED dnl
+ $EVOLUTION_ADDITIONAL dnl
libebook-1.2 dnl
])
diff --git a/src/parser.c b/src/parser.c
index 91484a5..f5b422b 100644
--- a/src/parser.c
+++ b/src/parser.c
@@ -25,7 +25,11 @@
#include
From ea3b0faef0a508f0fdf9a356e974c027c9f7fe21 Mon Sep 17 00:00:00 2001 From: Milan Crha
Date: Wed, 15 Feb 2012 13:05:22 +0000 Subject: Adapt to recent changes in e_preferences_window_add_page()
--- diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index 1f85541..555b28a 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -4177,6 +4177,9 @@ init_rss_prefs(void) "page-rss", "rss", _("News And Blogs"), +#if EVOLUTION_VERSION >= 30390 + NULL, +#endif (EPreferencesWindowCreatePageFn)rss_config_control_new, 800); } -- cgit v0.9.0.2 -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org