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 - vu...@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 vu...@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 <mc...@redhat.com> 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 <libxml/HTMLparser.h> #include <libxml/HTMLtree.h> #include <libxml/debugXML.h> +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/mail-ops.h> +#else #include <mail/mail-ops.h> +#endif #include <mail/em-format-html.h> #if (DATASERVER_VERSION >= 2031001) #include <camel/camel.h> diff --git a/src/rss-config-factory.c b/src/rss-config-factory.c index ebb8bb1..1f85541 100644 --- a/src/rss-config-factory.c +++ b/src/rss-config-factory.c @@ -50,9 +50,13 @@ #include <mail/e-mail-local.h> #endif #include <mail/em-folder-selector.h> +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#else #if EVOLUTION_VERSION >= 30101 #include <mail/e-mail-folder-utils.h> #endif +#endif #include <mail/em-utils.h> #include <shell/e-shell.h> diff --git a/src/rss-evo-common.c b/src/rss-evo-common.c index 2300e57..ee5603f 100644 --- a/src/rss-evo-common.c +++ b/src/rss-evo-common.c @@ -26,9 +26,13 @@ #if (EVOLUTION_VERSION < 30303) #include <mail/e-mail-local.h> #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#else #if EVOLUTION_VERSION >= 30101 #include <mail/e-mail-folder-utils.h> #endif +#endif #include <mail/e-mail-reader.h> #include <mail/em-folder-utils.h> #include <libedataserver/e-proxy.h> diff --git a/src/rss.c b/src/rss.c index 47a18fd..7a6f611 100644 --- a/src/rss.c +++ b/src/rss.c @@ -51,9 +51,6 @@ int rss_verbose_debug = 0; #include <mail/em-event.h> #include <mail/em-utils.h> #include <mail/em-folder-tree.h> -#if EVOLUTION_VERSION >= 30101 -#include <mail/e-mail-folder-utils.h> -#endif #if EVOLUTION_VERSION < 22900 //kb// #include <e-util/e-error.h> @@ -69,9 +66,7 @@ int rss_verbose_debug = 0; #if EVOLUTION_VERSION < 30303 #include <mail/e-mail-local.h> #endif -#if EVOLUTION_VERSION >= 29101 -#include <mail/e-mail-session.h> -#else +#if EVOLUTION_VERSION < 29101 #include <mail/mail-session.h> #endif #include <shell/e-shell.h> @@ -81,8 +76,21 @@ int rss_verbose_debug = 0; #endif #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/mail-tools.h> +#include <libemail-engine/mail-ops.h> +#include <libemail-engine/e-mail-session.h> +#include <libemail-engine/e-mail-folder-utils.h> +#else +#if EVOLUTION_VERSION >= 30101 +#include <mail/e-mail-folder-utils.h> +#endif #include <mail/mail-tools.h> #include <mail/mail-ops.h> +#if EVOLUTION_VERSION >= 29101 +#include <mail/e-mail-session.h> +#endif +#endif #include <mail/em-format-html.h> #include <mail/em-format-hook.h> -- cgit v0.9.0.2 >From ea3b0faef0a508f0fdf9a356e974c027c9f7fe21 Mon Sep 17 00:00:00 2001 From: Milan Crha <mc...@redhat.com> 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+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
