Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2013-04-14 10:13:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/evolution-tray (Old) and /work/SRC/openSUSE:Factory/.evolution-tray.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "evolution-tray", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/evolution-tray/evolution-tray.changes 2012-10-16 07:00:21.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes 2013-04-14 10:13:52.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Apr 13 14:38:04 UTC 2013 - [email protected] + +- Add evolution-tray-evo-3.8.patch: Fix build with evolution 3.8. + +------------------------------------------------------------------- New: ---- evolution-tray-evo-3.8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.dObpi2/_old 2013-04-14 10:13:54.000000000 +0200 +++ /var/tmp/diff_new_pack.dObpi2/_new 2013-04-14 10:13:54.000000000 +0200 @@ -1,7 +1,7 @@ # # spec file for package evolution-tray # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -34,6 +34,8 @@ Patch3: evolution-tray-gconf.patch # PATCH-FIX-UPSTREAM evolution-tray-evo-3.6.patch [email protected] -- Fix build with evolution 3.6. Taken from git. Patch4: evolution-tray-evo-3.6.patch +# PATCH-FIX-UPSTREAM evolution-tray-evo-3.8.patch [email protected] -- Fix build with evolution 3.8. Taken from git. +Patch5: evolution-tray-evo-3.8.patch # needed for patch1 and patch3 BuildRequires: gnome-common BuildRequires: intltool @@ -60,6 +62,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %build # needed for patch1 and patch3 ++++++ evolution-tray-evo-3.8.patch ++++++ >From 915b7a176fe1b15b47dba9a4f53938abcb3acb17 Mon Sep 17 00:00:00 2001 From: Lucian Langa <[email protected]> Date: Wed, 06 Feb 2013 17:43:37 +0000 Subject: adapt to evo e-util changes --- diff --git a/src/tray.c b/src/tray.c index f052f37..8760976 100644 --- a/src/tray.c +++ b/src/tray.c @@ -37,7 +37,13 @@ #endif #endif +#if EVOLUTION_VERSION < 30704 #include <e-util/e-config.h> +#include <e-util/e-plugin.h> +#include <e-util/e-icon-factory.h> +#else +#include <e-util/e-util.h> +#endif #if EVOLUTION_VERSION < 22900 #include <mail/em-popup.h> @@ -66,7 +72,6 @@ #else #include <mail/mail-ops.h> #endif -#include <e-util/e-plugin.h> #include <mail/em-event.h> #include <mail/em-folder-tree.h> @@ -75,7 +80,6 @@ #include <mail/e-mail-reader.h> #endif -#include <e-util/e-icon-factory.h> #include <shell/es-event.h> #ifdef HAVE_LIBNOTIFY -- cgit v0.9.1 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
