Hello community, here is the log from the commit of package evolution-tray for openSUSE:Factory checked in at 2012-03-01 17:19:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2011-10-02 10:00:36.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.evolution-tray.new/evolution-tray.changes 2012-03-01 17:19:36.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Feb 29 07:46:17 UTC 2012 - vu...@opensuse.org + +- Add evolution-tray-git-00c08ae8.patch: update to current git + (last commit from January 21), to update the code to work with + evolution 3.4 and get build fixes. +- This patch brings the following changes: + + Add minimize to tray ability. + + Port to GSettings, following evolution changes. + + Build fixes. +- Add evolution-tray-evo-3.4.patch: additional fixes for latest + evolution 3.3.x. +- Add gnome-common BuildRequires and call to gnome-autogen.sh, + needed for evolution-tray-git-00c08ae8.patch. +- Use %glib2_gsettings_schema_* macros. + +------------------------------------------------------------------- New: ---- evolution-tray-evo-3.4.patch evolution-tray-git-00c08ae8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution-tray.spec ++++++ --- /var/tmp/diff_new_pack.uW6RfV/_old 2012-03-01 17:19:37.000000000 +0100 +++ /var/tmp/diff_new_pack.uW6RfV/_new 2012-03-01 17:19:37.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package evolution-tray # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -16,17 +16,22 @@ # - Name: evolution-tray Version: 0.0.8 -Release: 1 -License: GPL-2.0+ +Release: 0 Summary: Evolution plugin to minimize in tray -Url: http://gnome.eu.org/evo/index.php/Evolution_Tray +License: GPL-2.0+ Group: Productivity/Office/Other +Url: http://gnome.eu.org/evo/index.php/Evolution_Tray Source0: http://gnome.eu.org/%{name}-%{version}.tar.gz # PATCH-FIX-UPSTREAM evolution-tray-fix-include.patch vu...@opensuse.org -- Add missing include; sent upstream by mail Patch0: evolution-tray-fix-include.patch +# PATCH-FIX-UPSTREAM evolution-tray-git-00c08ae8.patch vu...@opensuse.org -- Update to latest git +Patch1: evolution-tray-git-00c08ae8.patch +# PATCH-FIX-UPSTREAM evolution-tray-evo-3.4.patch vu...@opensuse.org -- Fix build with latest evo 3.3.x; sent upstream by mail +Patch2: evolution-tray-evo-3.4.patch +# needed for patch1 +BuildRequires: gnome-common BuildRequires: intltool BuildRequires: pkgconfig(evolution-plugin-3.0) BuildRequires: pkgconfig(evolution-shell-3.0) @@ -35,6 +40,7 @@ Requires: evolution Enhances: evolution BuildRoot: %{_tmppath}/%{name}-%{version}-build +%glib2_gsettings_schema_requires %description This plugin is useful when you want to put evolution in the "tray" @@ -45,8 +51,12 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 +%patch2 -p1 %build +# needed for patch1 +NOCONFIGURE=1 gnome-autogen.sh %configure %__make %{?_smp_mflags} V=1 @@ -54,9 +64,17 @@ %makeinstall find %{buildroot}%{_libdir} -name '*.la' -type f -delete -print +%post +%glib2_gsettings_schema_post + +%postun +%glib2_gsettings_schema_postun + %files %defattr(-,root,root) %doc AUTHORS COPYING +%{_datadir}/GConf/gsettings/evolution-tray.convert +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.evolution-tray.gschema.xml %{_libdir}/evolution/*/plugins/liborg-gnome-evolution-tray.so %{_libdir}/evolution/*/plugins/org-gnome-evolution-tray.eplug ++++++ evolution-tray-evo-3.4.patch ++++++ Index: evolution-tray-0.0.8/src/tray.c =================================================================== --- evolution-tray-0.0.8.orig/src/tray.c +++ evolution-tray-0.0.8/src/tray.c @@ -43,6 +43,10 @@ #include <shell/e-shell-view.h> #include <shell/e-shell-window.h> #endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-utils/e-account-utils.h> +#include <mail/e-mail.h> +#else #if EVOLUTION_VERSION >= 29101 #include <e-util/e-account-utils.h> #include <mail/e-mail.h> @@ -50,7 +54,13 @@ #include <mail/mail-config.h> #include <mail/mail-session.h> #endif +#endif +#if EVOLUTION_VERSION >= 30305 +#include <libemail-engine/e-mail-folder-utils.h> +#include <libemail-engine/mail-ops.h> +#else #include <mail/mail-ops.h> +#endif #include <e-util/e-plugin.h> #include <mail/em-event.h> ++++++ evolution-tray-git-00c08ae8.patch ++++++ ++++ 800 lines (skipped) -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
