From 7c9807ba245e12b4704c9534a821a79a912c95826d3e6ad83c383a7ee971618e Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 20 May 2009 22:58:36 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=66 --- evolution-2.26.1.1.tar.bz2 | 3 - evolution-2.27.1.tar.bz2 | 3 + evolution.changes | 33 +++++++++ evolution.spec | 43 +++++++++-- sp-meetingworkspace-ui.patch | 136 ++++++++++++++--------------------- 5 files changed, 125 insertions(+), 93 deletions(-) delete mode 100644 evolution-2.26.1.1.tar.bz2 create mode 100644 evolution-2.27.1.tar.bz2 diff --git a/evolution-2.26.1.1.tar.bz2 b/evolution-2.26.1.1.tar.bz2 deleted file mode 100644 index b3a4f56..0000000 --- a/evolution-2.26.1.1.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82d6b10c5682900d91dfa40b8c1e76e7ef2e2168e26982828814ffc66930daa2 -size 32809193 diff --git a/evolution-2.27.1.tar.bz2 b/evolution-2.27.1.tar.bz2 new file mode 100644 index 0000000..d0fedfc --- /dev/null +++ b/evolution-2.27.1.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2831a4601636c6cfc7eb37736e915535bcfc8165543255272f816e22796f9c43 +size 32859330 diff --git a/evolution.changes b/evolution.changes index 46cc596..f55839a 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Tue May 5 17:54:21 CEST 2009 - vuntz@novell.com + +- Update to version 2.27.1: + + bgo#574680 - Remove all headers except "References" and + "In-Reply-To" when composing from an existing message + + bnc#471083 - Do not allow deletion of system folders + + bgo#577615 - Get rid of "Adjust for daylight saving time" option + + bgo#381132 - Use system timezone in Evolution + + bgo#342296 - Be able to save mail to event, meeting, task or + memo + + bgo#516933 - Rewrite attachment UI + + bgo#567145 - External Editor rewrite + + bgo#573170 - Add back support for vfolder of vfolders + + Other bugfixes: bgo#504767, bgo#552583, bgo#576694, bgo#576696, + bgo#576845, bgo#576921, bgo#576921, bgo#577717, bgo#569765, + bgo#578034, bgo#577989, bgo#537530, bgo#529745, bgo#539002, + bgo#523802, bgo#574248, bgo#561312, bnc#467659, bgo#578685, + bgo#577929, bgo#565780, bgo#577898, bgo#572348, bgo#205804, + bgo#340783, bgo#552583, bgo#569652, bgo#563954, bgo#571272, + bgo#573704, bgo#579306, bgo#561188, bgo#553535, bgo#575773, + bgo#491755, bgo#579635, bgo#579550, bgo#572348, bgo#578335, + bgo#579774, bgo#570730, bgo#273818, bgo#580898, bgo#580894, + bgo#580896, bgo#580892, bgo#580893, bgo#575242, bgo#581032, + bgo#542685, bgo#572977, bgo#577482, bgo#325131, bgo#574781, + bgo#575124, bgo#575122, bgo#569696, bgo#573830, bgo#355240 + + Icons for windows binaries. + + Updated translations. +- Respin sp-meetingworkspace-ui.patch. Hopefully, it still works + ;-) +- Do not apply bnc-445996-address-conflict.patch: the patch needs + rebasing, but I have no idea how it should be done. + ------------------------------------------------------------------- Sun Apr 26 14:29:25 CEST 2009 - vuntz@novell.com diff --git a/evolution.spec b/evolution.spec index 24a2256..76f8686 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.26.1.1) +# spec file for package evolution (Version 2.27.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -54,9 +54,9 @@ BuildRequires: update-desktop-files License: LGPL v2.0 only; LGPL v3 only Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. -%define evolution_base_version 2.26 -Version: 2.26.1.1 -Release: 2 +%define evolution_base_version 2.28 +Version: 2.27.1 +Release: 1 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2 Source1: summerdance-about2.png @@ -87,7 +87,7 @@ Patch41: sp-meetingworkspace-ui.patch Patch42: bnc-449888-handle-no-workspace.patch # PATCH-FIX-SLED bnc-440634-forwarded-hide-accept-decline.patch bnc440634 abharath@suse.de -- Make GW understand folders better. Patch53: bnc-440634-forwarded-hide-accept-decline.patch -# PATCH-FIX-SLED bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. +# PATCH-NEEDS-REBASE bnc-445996-address-conflict.patch bnc445996 shashish@suse.de -- Needs to be moved out of glade files. (was PATCH-FIX-SLED) Patch54: bnc-445996-address-conflict.patch # PATCH-FIX-SLED sp-process-meetings.diff pchenthill@suse.de -- Fix for bug 449899 (bnc) Patch101: sp-process-meetings.diff @@ -439,7 +439,7 @@ translation-update-upstream %patch41 -p1 %patch42 -p1 %patch53 -%patch54 +#%patch54 %patch101 -p1 #gnome-patch-translation-update @@ -550,7 +550,6 @@ fi %{_libdir}/evolution/*/plugins/*-evolution-bbdb.* %{_libdir}/evolution/*/plugins/*-evolution-caldav.* %{_libdir}/evolution/*/plugins/*-evolution-google.* -%{_libdir}/evolution/*/plugins/*-evolution-mail-attachments-import-ics.* %{_libdir}/evolution/*/plugins/*-evolution-startup-wizard.* %{_libdir}/evolution/*/plugins/*-evolution-webdav.* %{_libdir}/evolution/*/plugins/*-exchange-*-subscription.* @@ -599,6 +598,36 @@ fi #%{_libdir}/evolution/*/plugins/*.dll %changelog +* Tue May 05 2009 vuntz@novell.com +- Update to version 2.27.1: + + bgo#574680 - Remove all headers except "References" and + "In-Reply-To" when composing from an existing message + + bnc#471083 - Do not allow deletion of system folders + + bgo#577615 - Get rid of "Adjust for daylight saving time" option + + bgo#381132 - Use system timezone in Evolution + + bgo#342296 - Be able to save mail to event, meeting, task or + memo + + bgo#516933 - Rewrite attachment UI + + bgo#567145 - External Editor rewrite + + bgo#573170 - Add back support for vfolder of vfolders + + Other bugfixes: bgo#504767, bgo#552583, bgo#576694, bgo#576696, + bgo#576845, bgo#576921, bgo#576921, bgo#577717, bgo#569765, + bgo#578034, bgo#577989, bgo#537530, bgo#529745, bgo#539002, + bgo#523802, bgo#574248, bgo#561312, bnc#467659, bgo#578685, + bgo#577929, bgo#565780, bgo#577898, bgo#572348, bgo#205804, + bgo#340783, bgo#552583, bgo#569652, bgo#563954, bgo#571272, + bgo#573704, bgo#579306, bgo#561188, bgo#553535, bgo#575773, + bgo#491755, bgo#579635, bgo#579550, bgo#572348, bgo#578335, + bgo#579774, bgo#570730, bgo#273818, bgo#580898, bgo#580894, + bgo#580896, bgo#580892, bgo#580893, bgo#575242, bgo#581032, + bgo#542685, bgo#572977, bgo#577482, bgo#325131, bgo#574781, + bgo#575124, bgo#575122, bgo#569696, bgo#573830, bgo#355240 + + Icons for windows binaries. + + Updated translations. +- Respin sp-meetingworkspace-ui.patch. Hopefully, it still works + ;-) +- Do not apply bnc-445996-address-conflict.patch: the patch needs + rebasing, but I have no idea how it should be done. * Sun Apr 26 2009 vuntz@novell.com - Remove unneeded BuildRequires: notification-daemon, perl-XML-Parser. diff --git a/sp-meetingworkspace-ui.patch b/sp-meetingworkspace-ui.patch index 16217ec..42a6b10 100644 --- a/sp-meetingworkspace-ui.patch +++ b/sp-meetingworkspace-ui.patch @@ -1,71 +1,41 @@ -Index: evolution-2.25.90/calendar/gui/dialogs/comp-editor.c +Index: evolution-2.27.1/calendar/gui/dialogs/comp-editor.c =================================================================== ---- evolution-2.25.90.orig/calendar/gui/dialogs/comp-editor.c -+++ evolution-2.25.90/calendar/gui/dialogs/comp-editor.c +--- evolution-2.27.1.orig/calendar/gui/dialogs/comp-editor.c ++++ evolution-2.27.1/calendar/gui/dialogs/comp-editor.c @@ -63,6 +63,7 @@ #include "../e-cal-popup.h" #include "../calendar-config-keys.h" #include "cal-attachment-select-file.h" +#include "../e-cal-event.h" + #include "widgets/misc/e-attachment-view.h" + #include "widgets/misc/e-attachment-paned.h" - #include "e-attachment-bar.h" - #include "misc/e-expander.h" -@@ -104,7 +105,7 @@ struct _CompEditorPrivate { - +@@ -100,6 +101,7 @@ struct _CompEditorPrivate { /* Manages menus and toolbars */ - GtkUIManager *manager; -- + GtkUIManager *ui_manager; + + GtkWidget *vbox; gchar *summary; guint32 attachment_bar_visible : 1; -@@ -2228,29 +2229,28 @@ setup_widgets (CompEditor *editor) - CompEditorPrivate *priv; - GtkWidget *expander_hbox; - GtkWidget *widget; -- GtkWidget *vbox; +@@ -1599,11 +1601,11 @@ comp_editor_init (CompEditor *editor) - priv = editor->priv; + container = GTK_WIDGET (editor); - /* Useful vbox */ -- vbox = gtk_vbox_new (FALSE, 0); -- gtk_container_add (GTK_CONTAINER (editor), vbox); -- gtk_widget_show (vbox); +- widget = gtk_vbox_new (FALSE, 0); +- gtk_container_add (GTK_CONTAINER (container), widget); +- gtk_widget_show (widget); + priv->vbox = gtk_vbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (editor), priv->vbox); + gtk_widget_show (priv->vbox); - /* Main Menu */ +- container = widget; ++ container = priv->vbox; + widget = comp_editor_get_managed_widget (editor, "/main-menu"); -- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), widget, FALSE, FALSE, 0); - gtk_widget_show (widget); - - /* Main Toolbar */ - widget = comp_editor_get_managed_widget (editor, "/main-toolbar"); -- gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), widget, FALSE, FALSE, 0); - gtk_widget_show (widget); - - /* Notebook */ - widget = gtk_notebook_new (); - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (widget), FALSE); -- gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), widget, TRUE, TRUE, 0); - gtk_widget_show (widget); - priv->notebook = GTK_NOTEBOOK (widget); - -@@ -2303,7 +2303,7 @@ setup_widgets (CompEditor *editor) - atk_object_set_description (gtk_widget_get_accessible (priv->attachment_expander), _("Press space key to toggle attachment bar")); - gtk_container_add (GTK_CONTAINER (priv->attachment_expander), priv->attachment_scrolled_window); - -- gtk_box_pack_start (GTK_BOX (vbox), priv->attachment_expander, FALSE, FALSE, 4); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), priv->attachment_expander, FALSE, FALSE, 4); - gtk_widget_show (priv->attachment_expander); - e_expander_set_expanded (E_EXPANDER (priv->attachment_expander), FALSE); - g_signal_connect_after (priv->attachment_expander, "activate", -@@ -2546,6 +2546,22 @@ comp_editor_get_ui_manager (CompEditor * - return editor->priv->manager; + gtk_box_pack_start (GTK_BOX (container), widget, FALSE, FALSE, 0); +@@ -1943,6 +1945,22 @@ comp_editor_get_ui_manager (CompEditor * + return editor->priv->ui_manager; } +GtkWidget * @@ -87,7 +57,7 @@ Index: evolution-2.25.90/calendar/gui/dialogs/comp-editor.c GtkAction * comp_editor_get_action (CompEditor *editor, const gchar *action_name) -@@ -2721,9 +2737,15 @@ comp_editor_append_page (CompEditor *edi +@@ -2100,9 +2118,15 @@ comp_editor_append_page (CompEditor *edi priv->pages = g_list_append (priv->pages, page); @@ -104,10 +74,10 @@ Index: evolution-2.25.90/calendar/gui/dialogs/comp-editor.c /* Listen for things happening on the page */ g_signal_connect_swapped ( page, "dates_changed", -Index: evolution-2.25.90/calendar/gui/dialogs/event-editor.c +Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.c =================================================================== ---- evolution-2.25.90.orig/calendar/gui/dialogs/event-editor.c -+++ evolution-2.25.90/calendar/gui/dialogs/event-editor.c +--- evolution-2.27.1.orig/calendar/gui/dialogs/event-editor.c ++++ evolution-2.27.1/calendar/gui/dialogs/event-editor.c @@ -38,6 +38,7 @@ #include #include @@ -163,10 +133,10 @@ Index: evolution-2.25.90/calendar/gui/dialogs/event-editor.c gtk_action_set_visible (action, FALSE); g_signal_connect ( -Index: evolution-2.25.90/calendar/gui/dialogs/event-editor.h +Index: evolution-2.27.1/calendar/gui/dialogs/event-editor.h =================================================================== ---- evolution-2.25.90.orig/calendar/gui/dialogs/event-editor.h -+++ evolution-2.25.90/calendar/gui/dialogs/event-editor.h +--- evolution-2.27.1.orig/calendar/gui/dialogs/event-editor.h ++++ evolution-2.27.1/calendar/gui/dialogs/event-editor.h @@ -68,6 +68,7 @@ GType event_editor_get_type (void); CompEditor * event_editor_new (ECal *client, CompEditorFlags flags); @@ -175,10 +145,10 @@ Index: evolution-2.25.90/calendar/gui/dialogs/event-editor.h G_END_DECLS -Index: evolution-2.25.90/calendar/gui/dialogs/event-page.c +Index: evolution-2.27.1/calendar/gui/dialogs/event-page.c =================================================================== ---- evolution-2.25.90.orig/calendar/gui/dialogs/event-page.c -+++ evolution-2.25.90/calendar/gui/dialogs/event-page.c +--- evolution-2.27.1.orig/calendar/gui/dialogs/event-page.c ++++ evolution-2.27.1/calendar/gui/dialogs/event-page.c @@ -701,6 +701,26 @@ create_image_event_box (const char *imag return box; } @@ -206,10 +176,10 @@ Index: evolution-2.25.90/calendar/gui/dialogs/event-page.c static void sensitize_widgets (EventPage *epage) { -Index: evolution-2.25.90/calendar/gui/dialogs/event-page.h +Index: evolution-2.27.1/calendar/gui/dialogs/event-page.h =================================================================== ---- evolution-2.25.90.orig/calendar/gui/dialogs/event-page.h -+++ evolution-2.25.90/calendar/gui/dialogs/event-page.h +--- evolution-2.27.1.orig/calendar/gui/dialogs/event-page.h ++++ evolution-2.27.1/calendar/gui/dialogs/event-page.h @@ -110,6 +110,8 @@ void event_page_add_attendee (EventPag EMeetingAttendee *attendee); void event_page_remove_all_attendees (EventPage *epage); @@ -219,10 +189,10 @@ Index: evolution-2.25.90/calendar/gui/dialogs/event-page.h G_END_DECLS #endif -Index: evolution-2.25.90/calendar/gui/e-cal-event.c +Index: evolution-2.27.1/calendar/gui/e-cal-event.c =================================================================== ---- evolution-2.25.90.orig/calendar/gui/e-cal-event.c -+++ evolution-2.25.90/calendar/gui/e-cal-event.c +--- evolution-2.27.1.orig/calendar/gui/e-cal-event.c ++++ evolution-2.27.1/calendar/gui/e-cal-event.c @@ -103,6 +103,16 @@ e_cal_event_target_new_component (ECalEv return t; } @@ -259,10 +229,10 @@ Index: evolution-2.25.90/calendar/gui/e-cal-event.c static void eceh_finalize (GObject *o) { -Index: evolution-2.25.90/calendar/gui/e-cal-event.h +Index: evolution-2.27.1/calendar/gui/e-cal-event.h =================================================================== ---- evolution-2.25.90.orig/calendar/gui/e-cal-event.h -+++ evolution-2.25.90/calendar/gui/e-cal-event.h +--- evolution-2.27.1.orig/calendar/gui/e-cal-event.h ++++ evolution-2.27.1/calendar/gui/e-cal-event.h @@ -38,6 +38,7 @@ typedef struct _ECalEventClass ECalEvent enum _e_cal_event_target_t { @@ -306,10 +276,10 @@ Index: evolution-2.25.90/calendar/gui/e-cal-event.h /* ********************************************************************** */ -Index: evolution-2.25.90/plugins/sharepoint-features/Makefile.am +Index: evolution-2.27.1/plugins/sharepoint-features/Makefile.am =================================================================== --- /dev/null -+++ evolution-2.25.90/plugins/sharepoint-features/Makefile.am ++++ evolution-2.27.1/plugins/sharepoint-features/Makefile.am @@ -0,0 +1,40 @@ +INCLUDES = \ + -I$(top_srcdir) \ @@ -351,10 +321,10 @@ Index: evolution-2.25.90/plugins/sharepoint-features/Makefile.am +BUILT_SOURCES = org-gnome-sharepoint-features.eplug + +CLEANFILES = $(BUILT_SOURCES) -Index: evolution-2.25.90/plugins/sharepoint-features/meetingworkspaces.glade +Index: evolution-2.27.1/plugins/sharepoint-features/meetingworkspaces.glade =================================================================== --- /dev/null -+++ evolution-2.25.90/plugins/sharepoint-features/meetingworkspaces.glade ++++ evolution-2.27.1/plugins/sharepoint-features/meetingworkspaces.glade @@ -0,0 +1,324 @@ + + @@ -680,10 +650,10 @@ Index: evolution-2.25.90/plugins/sharepoint-features/meetingworkspaces.glade + + + -Index: evolution-2.25.90/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml +Index: evolution-2.27.1/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml =================================================================== --- /dev/null -+++ evolution-2.25.90/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml ++++ evolution-2.27.1/plugins/sharepoint-features/org-gnome-sharepoint-features.eplug.xml @@ -0,0 +1,20 @@ + + + + -Index: evolution-2.25.90/plugins/sharepoint-features/meeting-workspace.c +Index: evolution-2.27.1/plugins/sharepoint-features/meeting-workspace.c =================================================================== --- /dev/null -+++ evolution-2.25.90/plugins/sharepoint-features/meeting-workspace.c ++++ evolution-2.27.1/plugins/sharepoint-features/meeting-workspace.c @@ -0,0 +1,230 @@ +#ifdef HAVE_CONFIG_H +#include @@ -940,11 +910,11 @@ Index: evolution-2.25.90/plugins/sharepoint-features/meeting-workspace.c + g_error_free (error); + } +} -Index: evolution-2.25.90/configure.in +Index: evolution-2.27.1/configure.in =================================================================== ---- evolution-2.25.90.orig/configure.in -+++ evolution-2.25.90/configure.in -@@ -928,6 +928,9 @@ if test "x${enable_mono}" = "xyes"; then +--- evolution-2.27.1.orig/configure.in ++++ evolution-2.27.1/configure.in +@@ -938,6 +938,9 @@ if test "x${enable_mono}" = "xyes"; then evolution-sharp, ndesk-dbus-1.0, ndesk-dbus-glib-1.0]) AC_SUBST(MONO_PLATFORM_CFLAGS) AC_SUBST(MONO_PLATFORM_LIBS) @@ -954,7 +924,7 @@ Index: evolution-2.25.90/configure.in MONO_BASED_PLUGINS="" dnl Sharepoint account setup -@@ -939,7 +942,7 @@ if test "x${enable_mono}" = "xyes"; then +@@ -949,7 +952,7 @@ if test "x${enable_mono}" = "xyes"; then PKG_CHECK_MODULES(ICE_DESKTOP, [Novell.IceDesktop, solvent]) AC_SUBST(ICE_DESKTOP_CFLAGS) AC_SUBST(ICE_DESKTOP_LIBS) @@ -963,8 +933,8 @@ Index: evolution-2.25.90/configure.in fi fi AC_SUBST(MONO_CFLAGS) -@@ -2139,6 +2142,7 @@ plugins/face/Makefile - plugins/external-editor/Makefile +@@ -2148,6 +2151,7 @@ plugins/templates/Makefile + plugins/tnef-attachments/Makefile plugins/webdav-account-setup/Makefile plugins/sharepoint-account-setup/Makefile +plugins/sharepoint-features/Makefile