diff --git a/evolution-3.3.2.tar.bz2 b/evolution-3.3.2.tar.bz2 deleted file mode 100644 index 1c6bf4e..0000000 --- a/evolution-3.3.2.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0115e1c04b20c3156b4db3e2956f58488168fdb0d27b18905c1ab9a511f29d91 -size 16853744 diff --git a/evolution-3.3.3.tar.xz b/evolution-3.3.3.tar.xz new file mode 100644 index 0000000..694c773 --- /dev/null +++ b/evolution-3.3.3.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5a866037de2d7902e86599f432180aa9ba4503871bfb36260946e2e31b42af0a +size 12574676 diff --git a/evolution-GtkHVBox.patch b/evolution-GtkHVBox.patch deleted file mode 100644 index c7b2235..0000000 --- a/evolution-GtkHVBox.patch +++ /dev/null @@ -1,464 +0,0 @@ -From b53cc892a7fd0048f0bee85faf673df7b226ad9e Mon Sep 17 00:00:00 2001 -From: Dominique Leuenberger -Date: Mon, 8 Aug 2011 09:48:37 +0200 -Subject: [PATCH] bgo#656143: Stop using deprecated Gtk[HV]Box(Class)? - ---- - calendar/gui/e-timezone-entry.h | 4 ++-- - capplet/settings/mail-account-view.h | 4 ++-- - capplet/settings/mail-settings-view.h | 4 ++-- - capplet/settings/mail-view.h | 2 +- - e-util/e-config.c | 4 ++-- - e-util/e-config.h | 4 ++-- - mail/e-mail-attachment-bar.h | 4 ++-- - mail/e-mail-pane.h | 4 ++-- - mail/e-mail-view.h | 4 ++-- - modules/calendar/e-calendar-preferences.h | 4 ++-- - modules/mail/em-composer-prefs.h | 4 ++-- - modules/mail/em-mailer-prefs.h | 4 ++-- - modules/mail/em-network-prefs.h | 4 ++-- - plugins/itip-formatter/itip-view.h | 4 ++-- - shell/e-shell-taskbar.h | 4 ++-- - widgets/misc/e-alert-bar.c | 2 +- - widgets/misc/e-attachment-button.h | 4 ++-- - widgets/misc/e-dateedit.h | 4 ++-- - widgets/misc/e-image-chooser.h | 4 ++-- - widgets/misc/e-preview-pane.h | 4 ++-- - widgets/misc/e-search-bar.h | 4 ++-- - widgets/misc/e-url-entry.h | 4 ++-- - widgets/table/e-table-field-chooser.h | 4 ++-- - 23 files changed, 44 insertions(+), 44 deletions(-) - -Index: evolution-3.3.1.1/calendar/gui/e-timezone-entry.h -=================================================================== ---- evolution-3.3.1.1.orig/calendar/gui/e-timezone-entry.h -+++ evolution-3.3.1.1/calendar/gui/e-timezone-entry.h -@@ -61,12 +61,12 @@ typedef struct _ETimezoneEntryClass ETim - typedef struct _ETimezoneEntryPrivate ETimezoneEntryPrivate; - - struct _ETimezoneEntry { -- GtkHBox parent; -+ GtkBox parent; - ETimezoneEntryPrivate *priv; - }; - - struct _ETimezoneEntryClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - - void (*changed) (ETimezoneEntry *timezone_entry); - }; -Index: evolution-3.3.1.1/capplet/settings/mail-account-view.h -=================================================================== ---- evolution-3.3.1.1.orig/capplet/settings/mail-account-view.h -+++ evolution-3.3.1.1/capplet/settings/mail-account-view.h -@@ -60,7 +60,7 @@ typedef struct _MAVPage { - }MAVPage; - - typedef struct _MailAccountView { -- GtkVBox parent; -+ GtkBox parent; - gint type; - const gchar *uri; - MailViewFlags flags; -@@ -80,7 +80,7 @@ typedef struct _MailAccountView { - } MailAccountView; - - typedef struct _MailAccountViewClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - - void (* view_close) (MailAccountView *); - -Index: evolution-3.3.1.1/capplet/settings/mail-settings-view.h -=================================================================== ---- evolution-3.3.1.1.orig/capplet/settings/mail-settings-view.h -+++ evolution-3.3.1.1/capplet/settings/mail-settings-view.h -@@ -36,7 +36,7 @@ - typedef struct _MailSettingsViewPrivate MailSettingsViewPrivate; - - typedef struct _MailSettingsView { -- GtkVBox parent; -+ GtkBox parent; - gint type; - const gchar *uri; - MailViewFlags flags; -@@ -46,7 +46,7 @@ typedef struct _MailSettingsView { - } MailSettingsView; - - typedef struct _MailSettingsViewClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - - void (* view_close) (MailSettingsView *); - void (* show_account) (MailSettingsView *, gpointer); -Index: evolution-3.3.1.1/capplet/settings/mail-view.h -=================================================================== ---- evolution-3.3.1.1.orig/capplet/settings/mail-view.h -+++ evolution-3.3.1.1/capplet/settings/mail-view.h -@@ -69,7 +69,7 @@ typedef enum { - } MailViewFlags; - - typedef struct _MailViewChild { -- GtkVBox parent; -+ GtkBox parent; - gint type; - gchar *uri; - MailViewFlags flags; -Index: evolution-3.3.1.1/e-util/e-config.c -=================================================================== ---- evolution-3.3.1.1.orig/e-util/e-config.c -+++ evolution-3.3.1.1/e-util/e-config.c -@@ -973,7 +973,7 @@ ec_rebuild (EConfig *emp) - - /* ITEMs are called with the section parent. - * The type depends on the section type, -- * either a GtkTable, or a GtkVBox */ -+ * either a GtkTable, or a GtkBox */ - w = NULL; - if (section == NULL) { - wn->widget = NULL; -@@ -1362,7 +1362,7 @@ e_config_page_check (EConfig *config, - * Retrieve the page widget corresponding to @pageid. - * - * Return value: The page widget. It will be the root GtkNotebook -- * container or the GtkVBox object inside the assistant. -+ * container or the GtkBox object inside the assistant. - **/ - GtkWidget * - e_config_page_get (EConfig *ec, -Index: evolution-3.3.1.1/e-util/e-config.h -=================================================================== ---- evolution-3.3.1.1.orig/e-util/e-config.h -+++ evolution-3.3.1.1/e-util/e-config.h -@@ -122,9 +122,9 @@ enum _e_config_target_change_t { - * @E_CONFIG_SECTION: A section in the configuration page. A page for - * this section must have already been defined. The item @label if - * supplied will be setup as a borderless hig-compliant frame title. -- * The content of the section will be a GtkVBox. If a factory is used -+ * The content of the section will be a GtkBox. If a factory is used - * then it is up to the factory method to create the section and add -- * it to the parent page, and return a GtkVBox for following sections. -+ * it to the parent page, and return a GtkBox for following sections. - * @E_CONFIG_SECTION_TABLE: A table section. The same as an - * @E_CONFIG_SECTION but the content object is a GtkTable instead. - * @E_CONFIG_ITEM: A configuration item. It must have a parent -Index: evolution-3.3.1.1/mail/e-mail-attachment-bar.h -=================================================================== ---- evolution-3.3.1.1.orig/mail/e-mail-attachment-bar.h -+++ evolution-3.3.1.1/mail/e-mail-attachment-bar.h -@@ -51,12 +51,12 @@ typedef struct _EMailAttachmentBarClass - typedef struct _EMailAttachmentBarPrivate EMailAttachmentBarPrivate; - - struct _EMailAttachmentBar { -- GtkVBox parent; -+ GtkBox parent; - EMailAttachmentBarPrivate *priv; - }; - - struct _EMailAttachmentBarClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType e_mail_attachment_bar_get_type (void); -Index: evolution-3.3.1.1/mail/e-mail-view.h -=================================================================== ---- evolution-3.3.1.1.orig/mail/e-mail-view.h -+++ evolution-3.3.1.1/mail/e-mail-view.h -@@ -53,12 +53,12 @@ typedef struct _EMailViewClass EMailView - typedef struct _EMailViewPrivate EMailViewPrivate; - - struct _EMailView { -- GtkVBox parent; -+ GtkBox parent; - EMailViewPrivate *priv; - }; - - struct _EMailViewClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - - /* Signals */ - void (*pane_close) (EMailView *view); -Index: evolution-3.3.1.1/modules/calendar/e-calendar-preferences.h -=================================================================== ---- evolution-3.3.1.1.orig/modules/calendar/e-calendar-preferences.h -+++ evolution-3.3.1.1/modules/calendar/e-calendar-preferences.h -@@ -54,7 +54,7 @@ typedef struct _ECalendarPreferences ECa - typedef struct _ECalendarPreferencesClass ECalendarPreferencesClass; - - struct _ECalendarPreferences { -- GtkVBox parent; -+ GtkBox parent; - - GtkBuilder *builder; - -@@ -76,7 +76,7 @@ struct _ECalendarPreferences { - }; - - struct _ECalendarPreferencesClass { -- GtkVBoxClass parent; -+ GtkBoxClass parent; - }; - - GType e_calendar_preferences_get_type (void); -Index: evolution-3.3.1.1/modules/mail/em-composer-prefs.h -=================================================================== ---- evolution-3.3.1.1.orig/modules/mail/em-composer-prefs.h -+++ evolution-3.3.1.1/modules/mail/em-composer-prefs.h -@@ -56,7 +56,7 @@ typedef struct _EMComposerPrefsClass EMC - struct _ESignature; - - struct _EMComposerPrefs { -- GtkVBox parent; -+ GtkBox parent; - - GtkBuilder *builder; - -@@ -73,7 +73,7 @@ struct _EMComposerPrefs { - }; - - struct _EMComposerPrefsClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType em_composer_prefs_get_type (void); -Index: evolution-3.3.1.1/modules/mail/em-mailer-prefs.h -=================================================================== ---- evolution-3.3.1.1.orig/modules/mail/em-mailer-prefs.h -+++ evolution-3.3.1.1/modules/mail/em-mailer-prefs.h -@@ -53,7 +53,7 @@ typedef struct _EMMailerPrefs EMMailerPr - typedef struct _EMMailerPrefsClass EMMailerPrefsClass; - - struct _EMMailerPrefs { -- GtkVBox parent_object; -+ GtkBox parent_object; - - GtkBuilder *builder; - GConfClient *gconf; -@@ -103,7 +103,7 @@ struct _EMMailerPrefs { - }; - - struct _EMMailerPrefsClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType em_mailer_prefs_get_type (void); -Index: evolution-3.3.1.1/modules/mail/em-network-prefs.h -=================================================================== ---- evolution-3.3.1.1.orig/modules/mail/em-network-prefs.h -+++ evolution-3.3.1.1/modules/mail/em-network-prefs.h -@@ -59,7 +59,7 @@ typedef enum { - } NetworkConfigProxyType; - - struct _EMNetworkPrefs { -- GtkVBox parent_object; -+ GtkBox parent_object; - - GConfClient *gconf; - -@@ -94,7 +94,7 @@ struct _EMNetworkPrefs { - }; - - struct _EMNetworkPrefsClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType em_network_prefs_get_type (void); -Index: evolution-3.3.1.1/plugins/itip-formatter/itip-view.h -=================================================================== ---- evolution-3.3.1.1.orig/plugins/itip-formatter/itip-view.h -+++ evolution-3.3.1.1/plugins/itip-formatter/itip-view.h -@@ -76,7 +76,7 @@ typedef enum { - } ItipViewInfoItemType; - - struct _ItipView { -- GtkHBox parent_instance; -+ GtkBox parent_instance; - - ItipViewPrivate *priv; - -@@ -84,7 +84,7 @@ struct _ItipView { - }; - - struct _ItipViewClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - - void (* source_selected) (ItipView *view, ESource *selected_source); - void (* response) (ItipView *view, gint response); -Index: evolution-3.3.1.1/shell/e-shell-taskbar.h -=================================================================== ---- evolution-3.3.1.1.orig/shell/e-shell-taskbar.h -+++ evolution-3.3.1.1/shell/e-shell-taskbar.h -@@ -59,12 +59,12 @@ typedef struct _EShellTaskbarPrivate ESh - * functions below. - **/ - struct _EShellTaskbar { -- GtkHBox parent; -+ GtkBox parent; - EShellTaskbarPrivate *priv; - }; - - struct _EShellTaskbarClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType e_shell_taskbar_get_type (void); -Index: evolution-3.3.1.1/widgets/misc/e-alert-bar.c -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-alert-bar.c -+++ evolution-3.3.1.1/widgets/misc/e-alert-bar.c -@@ -177,7 +177,7 @@ alert_bar_dispose (GObject *object) - static GtkSizeRequestMode - alert_bar_get_request_mode (GtkWidget *widget) - { -- /* GtkHBox does width-for-height by default. But we -+ /* GtkBox does width-for-height by default. But we - * want the alert bar to be as short as possible. */ - return GTK_SIZE_REQUEST_HEIGHT_FOR_WIDTH; - } -Index: evolution-3.3.1.1/widgets/misc/e-attachment-button.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-attachment-button.h -+++ evolution-3.3.1.1/widgets/misc/e-attachment-button.h -@@ -52,12 +52,12 @@ typedef struct _EAttachmentButtonClass E - typedef struct _EAttachmentButtonPrivate EAttachmentButtonPrivate; - - struct _EAttachmentButton { -- GtkHBox parent; -+ GtkBox parent; - EAttachmentButtonPrivate *priv; - }; - - struct _EAttachmentButtonClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType e_attachment_button_get_type (void); -Index: evolution-3.3.1.1/widgets/misc/e-dateedit.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-dateedit.h -+++ evolution-3.3.1.1/widgets/misc/e-dateedit.h -@@ -60,14 +60,14 @@ typedef struct tm (*EDateEditGetTimeCall - gpointer data); - - struct _EDateEdit { -- GtkHBox hbox; -+ GtkBox hbox; - - /*< private >*/ - EDateEditPrivate *priv; - }; - - struct _EDateEditClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - - void (* changed) (EDateEdit *dedit); - }; -Index: evolution-3.3.1.1/widgets/misc/e-image-chooser.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-image-chooser.h -+++ evolution-3.3.1.1/widgets/misc/e-image-chooser.h -@@ -50,12 +50,12 @@ typedef struct _EImageChooserClass EImag - typedef struct _EImageChooserPrivate EImageChooserPrivate; - - struct _EImageChooser { -- GtkVBox parent; -+ GtkBox parent; - EImageChooserPrivate *priv; - }; - - struct _EImageChooserClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - - /* signals */ - void (*changed) (EImageChooser *chooser); -Index: evolution-3.3.1.1/widgets/misc/e-preview-pane.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-preview-pane.h -+++ evolution-3.3.1.1/widgets/misc/e-preview-pane.h -@@ -52,12 +52,12 @@ typedef struct _EPreviewPaneClass EPrevi - typedef struct _EPreviewPanePrivate EPreviewPanePrivate; - - struct _EPreviewPane { -- GtkVBox parent; -+ GtkBox parent; - EPreviewPanePrivate *priv; - }; - - struct _EPreviewPaneClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - - /* Signals */ - void (*show_search_bar) (EPreviewPane *preview_pane); -Index: evolution-3.3.1.1/widgets/misc/e-search-bar.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-search-bar.h -+++ evolution-3.3.1.1/widgets/misc/e-search-bar.h -@@ -52,12 +52,12 @@ typedef struct _ESearchBarClass ESearchB - typedef struct _ESearchBarPrivate ESearchBarPrivate; - - struct _ESearchBar { -- GtkHBox parent; -+ GtkBox parent; - ESearchBarPrivate *priv; - }; - - struct _ESearchBarClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - - /* Signals */ - void (*changed) (ESearchBar *search_bar); -Index: evolution-3.3.1.1/widgets/misc/e-url-entry.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/misc/e-url-entry.h -+++ evolution-3.3.1.1/widgets/misc/e-url-entry.h -@@ -38,13 +38,13 @@ typedef struct _EUrlEntryPrivate EUrlEnt - typedef struct _EUrlEntryClass EUrlEntryClass; - - struct _EUrlEntry { -- GtkHBox parent; -+ GtkBox parent; - - EUrlEntryPrivate *priv; - }; - - struct _EUrlEntryClass { -- GtkHBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType e_url_entry_get_type (void); -Index: evolution-3.3.1.1/widgets/table/e-table-field-chooser.h -=================================================================== ---- evolution-3.3.1.1.orig/widgets/table/e-table-field-chooser.h -+++ evolution-3.3.1.1/widgets/table/e-table-field-chooser.h -@@ -53,7 +53,7 @@ typedef struct _ETableFieldChooser ETabl - typedef struct _ETableFieldChooserClass ETableFieldChooserClass; - - struct _ETableFieldChooser { -- GtkVBox parent; -+ GtkBox parent; - - /* item specific fields */ - GnomeCanvas *canvas; -@@ -68,7 +68,7 @@ struct _ETableFieldChooser { - }; - - struct _ETableFieldChooserClass { -- GtkVBoxClass parent_class; -+ GtkBoxClass parent_class; - }; - - GType e_table_field_chooser_get_type (void) G_GNUC_CONST; diff --git a/evolution.changes b/evolution.changes index f40b7cc..2fddbd3 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,23 +1,51 @@ +------------------------------------------------------------------- +Tue Dec 20 13:30:37 UTC 2011 - vuntz@opensuse.org + +- Update to version 3.3.3: + + Migrate to GSettings. + + Reorder accounts by drag-and-drop. + + Add a hidden --version option. + + Remove some unnecessary GConf crud. + + Split MDN handling into a module. + + Various other code changes. + + Bugs fixed: + - bgo#566793: Support Drop And Drag Into Nautilus As PDF File + - bgo#577322: Rename of a system ESource doesn't persist + - bgo#585066: Add Auto-Submitted header to outgoing MDNs + - bgo#661043: Printing causes email images to download + - bgo#376075, bgo#561696, bgo#578245, bgo#580394, bgo#582649, + bgo#616561, bgo#659491, bgo#663122, bgo#663615, bgo#664018, + bgo#664634, bgo#664654, bgo#664678, bgo#664707, bgo#664708, + bgo#664753, bgo#665103, bgo#665123, bgo#665149, bgo#665782, + bgo#665980, bgo#665981, bgo#666081, bgo#666106, bgo#666341. + + Updated translations. +- Add xz BuildRequires because we can't build a package for a + xz-compressed tarball without explicitly specifying that... See + bnc#697467 for more details. +- Drop evolution-GtkHVBox.patch: while we could keep the patch, + it's not needed anymore to fix the build and it's easier to not + have to rebase it all the time. +- Mark bnc-210959-evo-accept-ics.patch as needing a rebase, and + stop applying it (bnc#737890). +- Only use gnome-common BuildRequires and call autoreconf, + intltoolize and tweak help/Makefile.in if we change the build + system, which is if %USE_EVOLDAP is set. +- Use %glib2_gsettings_schema_* macros for new GSettings schemas. + ------------------------------------------------------------------- Mon Nov 21 08:34:45 UTC 2011 - dimstar@opensuse.org - Update to version 3.3.2: + Remove g_thread_init() calls. + Teach Evolution about Photo/Logo EContact fields stored as URIs - + Add EAuthComboBox widget. - + EMAccountEditor: Start using CamelNetworkSettings. - + Call e_gdbus_templates_init_main_thread() in main() - + Kill gtk-doc tmpl files. - + Removing a redundant virtual function - + Remove SQLite mail summary migration. - + EMAccountEditor: Add a review page. - + Preset 'width-chars' for account type description labels - + Use CamelSExp instead of ESExp in filter, mail. - + Bugs fixed: bgo#440316, bgo#565483, bgo#627952, bgo#636214, - bgo#659557, bgo#659736, bgo#659945, bgo#660782, bgo#660878, - bgo#661126, bgo#662589, bgo#662742, bgo#662914, bgo#662929, - bgo#663286, bgo#663372, bgo#663376, bgo#663746, bgo#663748, - bgo#663836, bgo#664001, bgo#664016 + + Various other code changes. + + Bugs fixed: + - bgo#662914: Reply to gnupg signed mails should be signed + - bgo#440316, bgo#565483, bgo#627952, bgo#636214, bgo#659557, + bgo#659736, bgo#659945, bgo#660782, bgo#660878, bgo#661126, + bgo#662589, bgo#662742, bgo#662929, bgo#663286, bgo#663372, + bgo#663376, bgo#663746, bgo#663748, bgo#663836, bgo#664001, + bgo#664016. + Updated translations. ------------------------------------------------------------------- @@ -30,8 +58,25 @@ Thu Oct 27 21:55:45 UTC 2011 - dimstar@opensuse.org Wed Oct 26 19:42:33 UTC 2011 - dimstar@opensuse.org - Update to version 3.3.1: - + Bugs fixed: bgo#660738, bgo#616981, bgo#451377, bgo#661409, - bgo#527616, bgo#661549. + + User documentation improvements. + + Move EExtension framework to libebackend. + + Various other code changes. + + Bugs fixed: + - bgo#351025: Make the order of the mail accounts configurable + - bgo#527614: Valgrind shows a nice amount of lost memory + - bgo#601898: SOCKS proxy does not work with mailer + - bgo#657374: mailto: attachment parameter can lead to + accidental data exfiltration + - bgo#660530: Improve folder Subscription interface + - bgo#235665, bgo#451377, bgo#455271, bgo#576478, bgo#616981, + bgo#632619, bgo#637673, bgo#655252, bgo#655625, bgo#656378, + bgo#656473, bgo#657170, bgo#658066, bgo#658835, bgo#659440, + bgo#659486, bgo#659517, bgo#659555, bgo#659558, bgo#659568, + bgo#659726, bgo#659828, bgo#659874, bgo#659876, bgo#659932, + bgo#660224, bgo#660584, bgo#660721, bgo#660738, bgo#660782, + bgo#660799, bgo#660829, bgo#660850, bgo#660861, bgo#660878, + bgo#661399, bgo#661404, bgo#661409, bgo#661434, bgo#661534, + bgo#661542, bgo#661549, bgo#661650. + Updated translations. - Drop evolution-text-colour.patch: fixed upstream. - Rebase evolution-GtkHVBox.patch. diff --git a/evolution.spec b/evolution.spec index 004cb5d..72534d6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,9 @@ BuildRequires: evoldap2-devel BuildRequires: openldap2-devel %endif BuildRequires: fdupes +%if %USE_EVOLDAP BuildRequires: gnome-common +%endif BuildRequires: gnome-doc-utils-devel BuildRequires: gtk-doc BuildRequires: intltool @@ -40,6 +42,8 @@ BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +# Only needed because we don't (and won't) support building xz tarballs by default... See bnc#697467 +BuildRequires: xz BuildRequires: pkgconfig(NetworkManager) BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(gail) @@ -68,27 +72,26 @@ BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(shared-mime-info) -License: LGPLv2.0 ; LGPLv3 -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 3.4 -Version: 3.3.2 -Release: 1 +Version: 3.3.3 +Release: 0 # FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite -Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.bz2 +License: LGPL-2.0 ; LGPL-3.0 +Group: Productivity/Networking/Email/Clients +Source0: http://download.gnome.org/sources/evolution/3.3/%{name}-%{version}.tar.xz # PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include Patch15: evolution-custom-openldap-includes.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. Patch19: bnc-435722-book-uri-long.patch -# PATCH-FIX-UPSTREAM bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. +# PATCH-NEEDS-REBASE bnc-210959-evo-accept-ics.patch bnc210959 pchenthill@novell.com -- Patch yet to be pushed upstream. (was PATCH-FIX-UPSTREAM) Patch35: bnc-210959-evo-accept-ics.patch -# PATCH-FIX-UPSTREAM evolution-GtkHVBox.patch bgo#656143 dimstar@opensuse.org -- Stop using deprecated Gtk[HV]Box(Class)?. -Patch36: evolution-GtkHVBox.patch Url: http://gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang Recommends: bogofilter +%glib2_gsettings_schema_requires %gconf_schemas_prereq %description @@ -98,7 +101,6 @@ of the modular design, it is possible to plug new components into Evolution or embed the existing ones in other applications. %package -n glade-catalog-evolution -License: LGPLv2.0 ; LGPLv3 Summary: Evolution Library -- Catalog for Glade Group: Development/Tools/GUI Builders Requires: %{name} = %{version} @@ -115,7 +117,6 @@ This package provides a catalog for Glade, to allow the use of Evolution widgets in Glade. %package devel -License: LGPLv2.0 ; LGPLv3 Summary: Include Files and Libraries mandatory for Development Group: Development/Libraries/C and C++ Requires: evolution = %{version} @@ -127,7 +128,6 @@ This package contains all necessary include files and libraries needed to develop applications that require these. %package mono-plugins -License: LGPLv2.0 ; LGPLv3 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Group: Productivity/Networking/Email/Clients Requires: evolution = %{version} @@ -155,7 +155,6 @@ of the modular design, it is possible to plug new components into Evolution or embed the existing ones in other applications. %package python-plugins -License: LGPLv2.0 ; LGPLv3 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Group: Productivity/Networking/Email/Clients Requires: evolution = %{version} @@ -175,13 +174,15 @@ translation-update-upstream %patch15 -p1 %endif %patch19 -%patch35 -%patch36 -p1 +# needs-rebase +#%%patch35 %build +%if %USE_EVOLDAP autoreconf -f -i intltoolize --copy --force %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in +%endif %{configure} \ --disable-scrollkeeper \ %if %USE_EVOLDAP @@ -230,6 +231,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %pre -f %{name}.schemas_pre %post +%glib2_gsettings_schema_post %desktop_database_post %icon_theme_cache_post @@ -238,6 +240,7 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %preun -f %{name}.schemas_preun %postun +%glib2_gsettings_schema_postun %desktop_database_postun %icon_theme_cache_postun @@ -249,25 +252,37 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %dir %{_datadir}/gnome/help/%{name}/ %doc %{_datadir}/gnome/help/%{name}/C/ %{_bindir}/* +%{_datadir}/GConf/gsettings/evolution.convert %{_datadir}/applications/*.desktop %{_datadir}/evolution %{_datadir}/icons/hicolor/*/apps/*.png +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml +# Should not be installed as the plugin is not installed (bgo#666613) +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml %dir %{_libdir}/evolution %dir %{_libdir}/evolution/* %{_libdir}/evolution/*/*.so.* %dir %{_libdir}/evolution/*/modules/ %{_libdir}/evolution/*/modules/*-module-addressbook.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml %{_libdir}/evolution/*/modules/*-module-bogofilter.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %{_libdir}/evolution/*/modules/*-module-calendar.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml %{_libdir}/evolution/*/modules/*-module-composer-autosave.* %{_libdir}/evolution/*/modules/*-module-mail.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml %{_libdir}/evolution/*/modules/*-module-mailto-handler.* +%{_libdir}/evolution/*/modules/*-module-mdn.* %{_libdir}/evolution/*/modules/*-module-network-manager.* %{_libdir}/evolution/*/modules/*-module-offline-alert.* %{_libdir}/evolution/*/modules/*-module-online-accounts.* %{_libdir}/evolution/*/modules/*-module-plugin-lib.* %{_libdir}/evolution/*/modules/*-module-plugin-manager.* %{_libdir}/evolution/*/modules/*-module-spamassassin.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml %{_libdir}/evolution/*/modules/*-module-startup-wizard.* %dir %{_libdir}/evolution/*/plugins %{_libdir}/evolution/*/plugins/*-addressbook-file.* @@ -277,29 +292,37 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de %{_libdir}/evolution/*/plugins/*-calendar-weather.* %{_libdir}/evolution/*/plugins/*-default-source.* %{_libdir}/evolution/*/plugins/*-email-custom-header.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml %{_libdir}/evolution/*/plugins/*-evolution-attachment-reminder.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml %{_libdir}/evolution/*/plugins/*-evolution-bbdb.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml %{_libdir}/evolution/*/plugins/*-evolution-caldav.* %{_libdir}/evolution/*/plugins/*-evolution-google.* %{_libdir}/evolution/*/plugins/*-evolution-webdav.* %{_libdir}/evolution/*/plugins/*-gnome-audio-inline.* %{_libdir}/evolution/*/plugins/*-gnome-dbx-import.* %{_libdir}/evolution/*/plugins/*-gnome-face.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml %if %{use_gtkimageview} %{_libdir}/evolution/*/plugins/*-gnome-image-inline.* %endif %{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.* %{_libdir}/evolution/*/plugins/*-imap-features.* %{_libdir}/evolution/*/plugins/*-itip-formatter.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml %{_libdir}/evolution/*/plugins/*-mailing-list-actions.* %{_libdir}/evolution/*/plugins/*-mail-notification.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml %{_libdir}/evolution/*/plugins/*-mail-to-task.* %{_libdir}/evolution/*/plugins/*-mark-all-read.* %{_libdir}/evolution/*/plugins/*-prefer-plain.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml %{_libdir}/evolution/*/plugins/*-pst-import.* %{_libdir}/evolution/*/plugins/*-publish-calendar.* %{_libdir}/evolution/*/plugins/*-save-calendar.* %{_libdir}/evolution/*/plugins/*-templates.* +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/* %{_libexecdir}/evolution/*/csv2vcard