From 0dccbf7e2cd55bf63e13629e88ebfc6d0cf9a917b21543099f6281ea0f871826 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Fri, 6 Aug 2010 02:22:46 +0000 Subject: [PATCH] Accepting request 44643 from home:vuntz:branches:GNOME:Factory Copy from home:vuntz:branches:GNOME:Factory/evolution via accept of submit request 44643 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/44643 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=86 --- evolution-2.31.5.tar.bz2 | 3 - evolution-2.31.6.tar.bz2 | 3 + evolution-no-dbus-glib.patch | 42 +++++++++ evolution-shared-nss-db.patch | 40 -------- evolution.changes | 167 +++++++++++++++++++++++++++------- evolution.spec | 28 +++--- 6 files changed, 190 insertions(+), 93 deletions(-) delete mode 100644 evolution-2.31.5.tar.bz2 create mode 100644 evolution-2.31.6.tar.bz2 create mode 100644 evolution-no-dbus-glib.patch delete mode 100644 evolution-shared-nss-db.patch diff --git a/evolution-2.31.5.tar.bz2 b/evolution-2.31.5.tar.bz2 deleted file mode 100644 index cb0c9ed..0000000 --- a/evolution-2.31.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c041df86045a9f161d6c70b0c8b82023c1cf6bbb03d2a44efb2af0b9df118a37 -size 31504670 diff --git a/evolution-2.31.6.tar.bz2 b/evolution-2.31.6.tar.bz2 new file mode 100644 index 0000000..21901ed --- /dev/null +++ b/evolution-2.31.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a4c36b0773d810cf234ba466904da180af4ea35f270a87d0f7091d938f141d0b +size 31567308 diff --git a/evolution-no-dbus-glib.patch b/evolution-no-dbus-glib.patch new file mode 100644 index 0000000..922d835 --- /dev/null +++ b/evolution-no-dbus-glib.patch @@ -0,0 +1,42 @@ +commit 5c49c70d5568a9a68daa5facaa531ab317d1f005 +Author: Fridrich Štrba +Date: Thu Aug 5 01:01:19 2010 +0200 + + We are not using dbus-glib anymore, don't call dbus_g_thread_init + +diff --git a/calendar/gui/alarm-notify/notify-main.c b/calendar/gui/alarm-notify/notify-main.c +index 2696119..799229a 100644 +--- a/calendar/gui/alarm-notify/notify-main.c ++++ b/calendar/gui/alarm-notify/notify-main.c +@@ -57,7 +57,6 @@ main (gint argc, gchar **argv) + textdomain (GETTEXT_PACKAGE); + + g_thread_init (NULL); +- dbus_g_thread_init (); + + #ifdef G_OS_WIN32 + path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); +diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c +index e789f91..ec1019d 100644 +--- a/capplet/anjal-settings-main.c ++++ b/capplet/anjal-settings-main.c +@@ -225,7 +225,6 @@ main (gint argc, gchar *argv[]) + + if (!g_thread_get_initialized ()) + g_thread_init (NULL); +- dbus_g_thread_init (); + + client = gconf_client_get_default(); + +diff --git a/shell/main.c b/shell/main.c +index a525262..82d6e6a 100644 +--- a/shell/main.c ++++ b/shell/main.c +@@ -492,7 +492,6 @@ main (gint argc, gchar **argv) + g_type_init (); + if (!g_thread_get_initialized ()) + g_thread_init (NULL); +- dbus_g_thread_init (); + + #ifdef G_OS_WIN32 + path = g_build_path (";", _e_get_bindir (), g_getenv ("PATH"), NULL); diff --git a/evolution-shared-nss-db.patch b/evolution-shared-nss-db.patch deleted file mode 100644 index 0ca3148..0000000 --- a/evolution-shared-nss-db.patch +++ /dev/null @@ -1,40 +0,0 @@ -Index: evolution-2.29.3.1/configure.ac -=================================================================== ---- evolution-2.29.3.1.orig/configure.ac -+++ evolution-2.29.3.1/configure.ac -@@ -910,6 +910,9 @@ if test "x${enable_nss}" = "xyes" || tes - AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) - msg_smime="yes (Mozilla NSS)" - fi -+ -+ mozilla_nss="$mozilla_nss nss-shared-helper" -+ - AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) - AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) - AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir $mozilla_nss`",[Define to the full path of mozilla nss library]) -Index: evolution-2.29.3.1/smime/lib/e-cert-db.c -=================================================================== ---- evolution-2.29.3.1.orig/smime/lib/e-cert-db.c -+++ evolution-2.29.3.1/smime/lib/e-cert-db.c -@@ -73,6 +73,7 @@ - #include "e-util/e-dialog-utils.h" - #include "e-util/e-util-private.h" - #include -+#include - #include - #include - #include -@@ -166,7 +167,12 @@ initialize_nss (void) - #endif - - /* we initialize NSS here to make sure it only happens once */ -- success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path)); -+ success = (SECSuccess == nsshelp_open_db ("evolution", evolution_dir_path, 0)); -+ -+ if (!success) { -+ g_warning ("Opening non-shared cert database"); -+ success = (SECSuccess == NSS_InitReadWrite (evolution_dir_path)); -+ } - if (!success) { - success = (SECSuccess == NSS_Init (evolution_dir_path)); - if (success) diff --git a/evolution.changes b/evolution.changes index f558368..d7eac94 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,54 +1,155 @@ +------------------------------------------------------------------- +Fri Aug 6 02:11:42 CEST 2010 - vuntz@opensuse.org + +- Update to version 2.31.6: + + Evolution now complies with the XDG Base Directory + Specification. Data is now partitioned into three base + directories controlled by environment variables: + - $XDG_DATA_HOME/evolution + - $XDG_CACHE_HOME/evolution + - $XDG_CONFIG_HOME/evolution + Data which is managed by Evolution will be migrated from + $HOME/.evolution on startup. + + Reset BASE_VERSION to 2.32. + + Express mode now shows mail messages and folders in tabs, using + Clutter for animation effects if available. + + Warn on reply-to-all with too many recipients + + Add support for ignoring mailing list Reply-To: headers + + Change 'Reply to All' toolbar button into configurable + 'Group Reply' + + Add nag popup when mailing list hijacks private reply with + Reply-To: header + + Update to new icon theme + + Prefer gio-2.0 when requiring GLib libraries. + + Use the shell's active window as parent for dialog + + fix lifecycle nasties (bgo#625852) + + Bug Fixes: + - bgo#622181 - Backup settings uses unhelpful yes/no dialog + - bgo#624204 - Warn when replying privately to a mailing list + message + - bgo#625624 - Customizations of contacts views forgotten + - bgo#625724 - Message filters do no work + - bgo#598833, bgo#615049, bgo#622912, bgo#623035, bgo#624216, + bgo#624235, bgo#624237, bgo#624285, bgo#624335, bgo#624482, + bgo#624500, bgo#624525, bgo#624534, bgo#624677, bgo#624891, + bgo#625204, bgo#625606, bgo#625761 + + Updated translations. +- Drop evolution-shared-nss-db.patch: upstream fixed it another + way, with the sqlite NSS database. Thanks to Wolfgang Rosenauer + for checking this. Also drop nss-shared-helper-devel + BuildRequires. +- Remove gnome-pilot-devel, libpisock-devel, libpisync-devel, + pilot-link BuildRequires since gnome-pilot support was removed. +- Add missing krb5-devel BuildRequires. +- Remove gnome-patch-translation support: we don't patch anything + with new strings now. +- Call %suse_update_desktop_file on evolution-settings.desktop. + ------------------------------------------------------------------- Tue Jul 13 08:40:48 UTC 2010 - dimstar@opensuse.org - Update to version 2.31.5: + Fix places where "~/.evolution" is hard-coded - + Migrate from CamelException to GError - + Fix transience problems with ENameSelectorDialogs ... + Allow edit accounts in the capplet to go fwd/back + Work around sudden disappearance of GdkRegion in GTK+ 2.90.5. - + bgo#624128: Folder -> Subscriptions is always enabled - + bgo#621839: Improve auto-selection of messages - + bgo#623702: SEGV on redirecting message - + bgo#623738: Select All is always enabled for message list - + bgo#623947: Error handling issues in em-format.c - + bgo#624011: EMeetingTimeSelector tries to change mouse cursor - before it's realized - + bgo#624022: "stock_mail-import" no longer exists in - gnome-icon-theme - + bgo#623204: Be able to report detailed errors from backends - + bgo#623769: Post Message to List asks for confirmation on close - + bgo#623432: Use gweather-3.0 when building with gtk3 - + bgo#623201: Set default options automatically while creating a - new account. + + Bug Fixes: + - bgo#624128: Folder -> Subscriptions is always enabled + - bgo#621839: Improve auto-selection of messages + - bgo#623738: Select All is always enabled for message list + - bgo#624011: EMeetingTimeSelector tries to change mouse cursor + before it's realized + - bgo#624022: "stock_mail-import" no longer exists in + gnome-icon-theme + - bgo#623769: Post Message to List asks for confirmation on + close + - bgo#623201: Set default options automatically while creating + a new account. + - bgo#623702, bgo#623947, bgo#623204, bgo#623432 - Disable bnc-440634-forwarded-hide-accept-decline.patch and bnc-435668-hide-accept.patch: patches need to be rebased for CAMEL API change (name is no longer a property) +- Remove explicit devel Requires in devel package: they will + automatically get added with pkgconfig()-style. ------------------------------------------------------------------- Mon Jul 12 12:45:38 CEST 2010 - dimstar@opensuse.org +- For details about all the upstream changes, see included NEWS + file. - Update to version 2.31.4: - + Add more missing icons for GtkhtmlEditor. - + More GTK3 preparation. + + Add Outlook Express DBX mailbox file importer plugin. + + Don't auto-undelete when viewing Trash folder. + + Warn the user before marking all messages as read. + + Remove gnome-pilot integration. + + Embed libart_lgpl and libgnomecanvas. + + Bug Fixes: + - bgo#206061 - Allow normal, non-vFolder, Trash and Junk folder + - bgo#617557 - Quits without asking user to save unfinished + messages + - bgo#622633 - Can't launch Evolution from clock applet + - bgo#623029, bgo#622535, bgo#553104, bgo#621770, bgo#617854, + bgo#620815, bgo#621903, bgo#622547, bgo#604262, bgo#622559, + bgo#611165, bgo#620246, bgo#331305, bgo#621819, bgo#622329, + bgo#619347, bgo#620951, bgo#621759, bgo#621210, bgo#616724, + bgo#621958, bgo#619098, bgo#621930, bgo#621839, bgo#585904, + bgo#534369, bgo#603468, bgo#619218, bgo#585301, bgo#585353, + bgo#501534, bgo#611100, bgo#573228 +- Changes from version 2.31.3: + Hook up GNOME's configured SOCKS4 proxy in the mail session - + Convert "startup-wizard" to an EExtension. - + Use the send_port, not the recv_port, when configuring SMTP for - an account - + [win32] Relocate the position of mail-autoconfig directory - + Use EWebView functions whenever possible. - + Fix alignment of lblCarset in composer-prefs-dialog + Simplify the Notes tab in Contact Editor. - + Install evolution-alarm-notify into bindir for windows - + [win32] Set a path in evolution-alarm-notify binary, so it - finds its dependencies even if it is started by a link in - StartUp submenu of Program menu. - + Revert "don't bridge to the active-view gconf setting" + Merge branch 'express2' - + Add tooltips for print button on CompEditor toolbar. - + For an extensive list, see NEWS -- Drop evolution-bnc576165-mono-plugin-crash.patch, merged upstream -- BuildRequire libgdata-devel. + + Bug Fixes: + - bgo#620602 - Next/prev shortcuts should focus message list + - bgo#585301 - Use NSS SQLite database, if available + - bgo#620150, bgo#620628, bgo#620635, bgo#257776, bgo#620207, + bgo#617579, bgo#617094, bgo#619345, bgo#620044, bgo#619417, + bgo#585577, bgo#619637, bgo#619783, bgo#613038, bgo#619903, + bgo#619900, bgo#619904, bgo#573510, bgo#313791, bgo#619781, + bgo#248105, bgo#613798, bgo#619811, bgo#478090, bgo#599794, + bgo#576165 +- Changes from version 2.31.2: + + Improve attachment bar selection behavior. + + Bug Fixes: + - bgo#240317 - Allow searching in subscribe dialog + - bgo#304415 - Allow change of signature hash algorithm + - bgo#220672, bgo#499320, bgo#523775, bgo#531013, bgo#531912, + bgo#545462, bgo#546551, bgo#593890, bgo#594153, bgo#598833, + bgo#603006, bgo#604971, bgo#607257, bgo#608855, bgo#611560, + bgo#615291, bgo#615745, bgo#616640, bgo#616823, bgo#616889, + bgo#617041, bgo#617496, bgo#617557, bgo#617865, bgo#618113, + bgo#618177, bgo#618400, bgo#618578, bgo#618902, bgo#619010 +- Changes from version 2.31.1: + + Drop the "hula-account-setup" plugin. + + Add meego detection logic. + + Express: Composer always defaults to HTML mode + + Hide searchbar in calendar view in express mode. + + Drop support for migrating from Evolution < 2.0. + + UI improvements. + + Bug Fixes: + - bgo#583742 - Port to external libgdata + - bgo#614346, bgo#545505, bgo#609052, bgo#569523, bgo#609052, + bgo#614900, bgo#604430, bgo#610495, bgo#615384, bgo#603418, + bgo#613392, bgo#360461, bgo#494047, bgo#615331, bgo#616097, + bgo#592986, bgo#610428, bgo#614041, bgo#615814, bgo#613867, + bgo#600861, bgo#569516, bgo#608766, bgo#608203, bgo#610229, + bgo#615263, bgo#611646, bgo#589393, bgo#614325, bgo#612236, + bgo#614644, bgo#614647, bgo#614813, bgo#614889, bgo#614892, + bgo#614918, bgo#614926, bgo#591939, bgo#574755, bgo#567304, + bgo#571714, bgo#567304, bgo#549971, bgo#547368, bgo#458828, + bgo#458510, bgo#458499, bgo#417412, bgo#347330, bgo#333039, + bgo#329694, bgo#325616, bgo#325609, bgo#592117, bgo#325121, + bgo#302742, bgo#272567, bgo#261979, bgo#261062, bgo#605745, + bgo#613352, bgo#613356, bgo#613354, bgo#613261, bgo#612916, + bgo#612821, bgo#602801, bgo#569945, bgo#488979, bgo#374533, + bgo#614049 +- Drop evolution-bnc576165-mono-plugin-crash.patch, fixed upstream. +- Add libgdata-devel BuildRequires. +- Remove pilot subpackage: the gnome-pilot support has been + removed. +- Remove --with-pisock, --enable-pilot-conduits=yes, --with-krb4, + --enable-exchange=yes, --enable-default-binary=yes, + --enable-icedesktop=no configure options: they don't exist + anymore. ------------------------------------------------------------------- Fri May 28 07:30:49 UTC 2010 - lnussel@suse.de diff --git a/evolution.spec b/evolution.spec index 385030b..182d427 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.31.4) +# spec file for package evolution (Version 2.31.6) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,29 +30,23 @@ BuildRequires: evolution-data-server-devel BuildRequires: fdupes BuildRequires: gnome-common BuildRequires: gnome-doc-utils-devel +BuildRequires: gnome-desktop-devel BuildRequires: gnome-icon-theme-devel -BuildRequires: gnome-patch-translation -BuildRequires: gnome-pilot-devel BuildRequires: gstreamer-0_10-devel BuildRequires: gtk-doc BuildRequires: gtkhtml2-devel BuildRequires: gtkimageview-devel BuildRequires: intltool +BuildRequires: krb5-devel BuildRequires: libcanberra-devel BuildRequires: libgdata-devel BuildRequires: libgweather-devel >= 2.25.4 BuildRequires: libnotify-devel -BuildRequires: libpisock-devel -BuildRequires: libpisync-devel BuildRequires: libpst-devel -BuildRequires: pkgconfig(unique-1.0) +BuildRequires: libunique-devel # don't you ever enable this! It's experimental and insecure (bnc#609013) #BuildRequires: libytnef-devel BuildRequires: mozilla-nss-devel -BuildRequires: nss-shared-helper-devel -BuildRequires: pilot-link -# This should only be needed until evolution is fully ported to the gnome3 stack. -BuildRequires: pkgconfig(gnome-desktop-2.0) BuildRequires: psmisc BuildRequires: python-devel BuildRequires: shared-mime-info @@ -62,17 +56,18 @@ BuildRequires: update-desktop-files 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.0 -Version: 2.31.5 +%define evolution_base_version 2.32 +Version: 2.31.6 +# FIXME: check with upstream/meego if we want to enable clutter for express mode 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 +# PATCH-FIX-UPSTREAM evolution-no-dbus-glib.patch vuntz@opensuse.org -- Taken from upstream, there's no use of dbus-glib anymore, so no need to call init functions +Patch0: evolution-no-dbus-glib.patch # PATCH-NEEDS-REBASE calendar-sendbutton.patch -- It also needs a proper description and a bug number Patch7: calendar-sendbutton.patch # 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-NEEDS-REBASE: evolution-shared-nss-db.patch hpj@novell.com -- Migrate to shared NSS database.(WAS: PATCH-FEATURE-OPENSUSE) -Patch16: evolution-shared-nss-db.patch # PATCH-NEEDS-REBASE bnc-435668-hide-accept.patch bnc#435668 -- Meetings In SentItems Should Hide Accept/Decline. (WAS: PATCH-FIX-UPSTREAM) Patch18: bnc-435668-hide-accept.patch # PATCH-FIX-UPSTREAM bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. @@ -158,12 +153,11 @@ Evolution or embed the existing ones in other applications. %prep %setup -q translation-update-upstream -gnome-patch-translation-prepare +%patch0 -p1 # %patch7 %if %USE_EVOLDAP %patch15 -p1 %endif -#%patch16 -p1 # NEEDS REBASE #%patch18 %patch19 @@ -182,7 +176,6 @@ gnome-patch-translation-prepare #%patch54 # NEEDS-REBASE #%patch101 -p1 -#gnome-patch-translation-update %build autoreconf -f -i @@ -214,6 +207,7 @@ popd find %{buildroot} -name '*.la' -type f -delete -print %suse_update_desktop_file -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution Core-Office %suse_update_desktop_file evolution-alarm-notify +%suse_update_desktop_file evolution-settings %find_lang evolution-%evolution_base_version %find_lang evolution evolution-%evolution_base_version.lang %find_gconf_schemas