From 320797ab546409d84d419a10aaeb6f30022c2a0e0af12086a90bca3815865370 Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Sat, 8 Sep 2012 12:17:17 +0000 Subject: [PATCH] Accepting request 133360 from home:vuntz:branches:GNOME:Factory suggested tweak OBS-URL: https://build.opensuse.org/request/show/133360 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/evolution?expand=0&rev=181 --- evolution.changes | 116 +++++++++++++++++++++++++++++----------------- evolution.spec | 24 ++++------ 2 files changed, 84 insertions(+), 56 deletions(-) diff --git a/evolution.changes b/evolution.changes index 5cf47b1..99999b1 100644 --- a/evolution.changes +++ b/evolution.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Sat Sep 8 09:20:25 UTC 2012 - vuntz@opensuse.org + +- Stop passing --enable-mono=yes and --enable-python=yes to + configure now that the mono and python plugins are gone. +- Remove unneeded python-devel BuildRequires, now that there are no + python plugins anymore. +- Replace gnome-doc-utils-devel BuildRequires with yelp-tools since + the documentation has been ported to the new build system. Also + remove explicit itstool BuildRequires which should not be needed. +- Re-enable translation-update-upstream: it works. +- Remove FIXME about enabling clutter for express mode: this + feature is gone now. + ------------------------------------------------------------------- Sun Sep 2 11:17:50 UTC 2012 - dimstar@opensuse.org @@ -9,6 +23,7 @@ Sun Sep 2 11:17:50 UTC 2012 - dimstar@opensuse.org + Make sure evolution-alarm-notify is running on Evolution's start + Support GStreamer 1.0 (bgo#682955) + + Various other code changes. + Bugs fixed: bgo#586186, bgo#678476, bgo#679862, bgo#680786, bgo#681431, bgo#681669, bgo#681877, bgo#682494, bgo#682519, bgo#682678, bgo#682811, bgo#682955 @@ -37,20 +52,19 @@ Sun Aug 19 22:14:42 UTC 2012 - dimstar@opensuse.org + User documentation improvements. + Return of the "mark messages as read" preference. + Remove all references to JavaScriptCore and use of JavaScript - - + EDayView: Hide tooltip on context menu popup - + backup-restore: Add version info to evolution.dirs file. + Run mbox-to-Maildir conversion before loading modules. + Remove the settings capplet. + express: Remove clutter-based email tabs. - + Add e_mail_session_append_to_local_folder(). + Add event/memo/task "Save As" item to File menu. + + Various other code changes. + Bugs fixed: bgo#246530, bgo#555325, bgo#559815, bgo#676785, bgo#677695, bgo#678408, bgo#680702, bgo#680724, bgo#680786, bgo#680947, bgo#681017, bgo#681279, bgo#681318, bgo#681321, bgo#681400, bgo#681432, bgo#681641, bgo#681783, bgo#681882, bgo#682019, bgo#682102 + Updated translations. +- Remove pkgconfig(javascriptcoregtk-3.0) BuildRequires: not needed + anymore. ------------------------------------------------------------------- Tue Aug 14 14:36:02 UTC 2012 - dimstar@opensuse.org @@ -64,17 +78,16 @@ Tue Aug 14 14:12:31 UTC 2012 - dimstar@opensuse.org - Update to version 3.5.5: + Various mail formatter and highlighter improvements + Improvements to user documentation - + Disable CompEditor when saving changes - + Use template files to generate GEnumClass types + mail-send-recv: Improve presentation + Fix few more memory leaks + Support creating and deleting remote resources + Remove all GDK threads usage + + Various other code changes. + Bugs fixed: bgo#677635, bgo#678635, bgo#679049, bgo#679404, bgo#679726, bgo#679843, bgo#680123, bgo#680164, bgo#680331, bgo#680535, bgo#680577, bgo#680634, bgo#680635, bgo#680643, - bgo#680666, bgo#680682, bgo#681075 - + Upadted translations. + bgo#680666, bgo#680682, bgo#681075. + + Updated translations. ------------------------------------------------------------------- Tue Aug 14 13:29:19 UTC 2012 - dimstar@opensuse.org @@ -91,15 +104,21 @@ Tue Aug 14 13:29:19 UTC 2012 - dimstar@opensuse.org + Don't load images in preview pane when openning Preferences Dialog + Trust attachments from ~/.kde and ~/.kde4 + + Use folder display name in status messages when possible. + + Add "auto-update" option to Search Folder Editor. + Update to libgweather 3.5 + Don't display SMIME signature as an attachment + Make alarm notifications work again - + Bugs fixed: bgo#223309, bgo#246231, bgo#257283, bgo#332115, - bgo#349875, bgo#515004, bgo#524737, bgo#548778, bgo#602425, - bgo#617557, bgo#653529, bgo#661886, bgo#674427, bgo#677604, - bgo#677695, bgo#677885, bgo#677993, bgo#678606, bgo#678667, - bgo#678783, bgo#678834, bgo#678946, bgo#679323, bgo#679649, - bgo#679726, bgo#679814 + + Various other code changes. + + Bugs fixed: + - bgo#223309: Add "Include Subfolders" to "Search Folder + Sources" + - bgo#515004: Allow toggling between text and HTML view of mail + - bgo#246231, bgo#257283, bgo#332115, bgo#349875, bgo#524737, + bgo#548778, bgo#602425, bgo#617557, bgo#653529, bgo#661886, + bgo#674427, bgo#677604, bgo#677695, bgo#677885, bgo#677993, + bgo#678606, bgo#678667, bgo#678783, bgo#678834, bgo#678946, + bgo#679323, bgo#679649, bgo#679726, bgo#679814. + Updated translations. ------------------------------------------------------------------- @@ -116,15 +135,13 @@ Tue Aug 14 12:21:00 UTC 2012 - dimstar@opensuse.org + Account data now resides in plain text files rather than GConf XML blobs. + User documentation improvements. - + Adapt to single-include E-D-S libraries. + Remove local mail autoconfiguration data. + Mail formatter rewrite - + Adapt to evolution-data-server's port from GConf to GSettings + No more experimental plugins. + Remove Mono and Python EPlugin bindings. + Reduce amount or EMailDisplay reloads when displaying Preferences dialog - + Avoid crash for providers without configuration backend + + Various other code changes. + Bugs fixed: bgo#300677, bgo#431497, bgo#569540, bgo#670876, bgo#674887, bgo#676179, bgo#676563, bgo#677597, bgo#677607, bgo#677608, bgo#677624, bgo#677628, bgo#677631, bgo#677673, @@ -133,13 +150,14 @@ Tue Aug 14 12:21:00 UTC 2012 - dimstar@opensuse.org bgo#678393, bgo#678397, bgo#678608, bgo#678609, bgo#678613, bgo#678634, bgo#764467. + Updated translations. -- Drop pkgconfig(gconf-2.0) BuildRequires: source migrated to - GSettings. -- Disable bnc-435722-book-uri-long.patch. Seems obsolete, but needs - to be verified. +- Drop pkgconfig(gconf-2.0) BuildRequires and gconf packaging + machinery: evolution is now fully ported to GSettings. +- Disable bnc-435722-book-uri-long.patch: this needs to be rebased, + or dropped if not needed anymore. - Drop pkgconfig(dbus-glib-1) BuildRequires: no longer needed. -- Drop mono-plugins and python-plugins subpackage, as they were - dropped upstrea, Obsolete the packages from the mainpackage. +- Drop mono-plugins and python-plugins subpackages, as they were + dropped upstream, add Obsoletes for those packages in the main + subpackage. - Disable translation-update-upstream. ------------------------------------------------------------------- @@ -151,34 +169,48 @@ Tue Aug 14 11:11:43 UTC 2012 - dimstar@opensuse.org preconfig also Tasks. + Avoid New unread icon emblem on virtual folders. + Make the settings capplet optional. - + Fix memory leaks around gtk_tree_model_get() function. - + Bugs fixed: bgo#200683, bgo#206484, bgo#246581, bgo#559710, - bgo#669111, bgo#669133, bgo#669295, bgo#669445, bgo#669463, - bgo#669657, bgo#669674, bgo#669893, bgo#669983, bgo#671585, - bgo#671585, bgo#672827, bgo#673514, bgo#673946, bgo#674997, - bgo#675061, bgo#675347, bgo#675391, bgo#675723, bgo#675725, - bgo#675728, bgo#675863, bgo#675871, bgo#676226, bgo#676410, - bgo#676492, bgo#677045, bgo#677273, bgo#677280. + + Various other code changes. + + Bugs fixed: + - bgo#246581: "Replies in Sent folder goes to myself" + - bgo#200683, bgo#206484, bgo#559710, bgo#669111, bgo#669133, + bgo#669295, bgo#669445, bgo#669463, bgo#669657, bgo#669674, + bgo#669893, bgo#669983, bgo#671585, bgo#671585, bgo#672827, + bgo#673514, bgo#673946, bgo#674997, bgo#675061, bgo#675347, + bgo#675391, bgo#675723, bgo#675725, bgo#675728, bgo#675863, + bgo#675871, bgo#676226, bgo#676410, bgo#676492, bgo#677045, + bgo#677273, bgo#677280. + Updated translations. ------------------------------------------------------------------- Tue Aug 14 10:50:03 UTC 2012 - dimstar@opensuse.org - Update to version 3.5.1: - + Bugs fixed: bgo#245025, bgo#528508, bgo#560654, bgo#584143, - bgo#593444, bgo#593449, bgo#593450, bgo#655753, bgo#668543, - bgo#668768, bgo#668769, bgo#668976, bgo#668989, bgo#668998, - bgo#670445, bgo#670609, bgo#670967, bgo#670967, bgo#671537, - bgo#671874, bgo#671876, bgo#672175, bgo#673013, bgo#673065, - bgo#673067, bgo#673108, bgo#673123, bgo#673225, bgo#673228, - bgo#673420, bgo#673430, bgo#673525, bgo#674034, bgo#674037, - bgo#674060, bgo#674062, bgo#674176, bgo#674194, bgo#674248, - bgo#674249, bgo#674272, bgo#674282, bgo#674340, bgo#674380, - bgo#674381, bgo#674466, bgo#674701. -- Drop pkgconfig(NetworkManager) BuildRequiress: upstream relies + + Evolution now uses WebKit/GTK+ instead of GtkHtml to display + emails, contacts, tasks and memos. Note that for the time being + Evolution still uses GtkHtml to compose emails. + + Use GNetworkMonitor to drive EShell:network-available. + + Add ability to specify INBOX for non-storage type accounts. + + Various other code changes. + + Bugs fixed: + - bgo#245025: Popup confirmation when moving a folder (via drag + and drop) + - bgo#528508: Wrap long lines when printing emails + - bgo#465076, bgo#560654, bgo#584143, bgo#593444, bgo#593449, + bgo#593450, bgo#655753, bgo#668543, bgo#668768, bgo#668769, + bgo#668976, bgo#668989, bgo#668998, bgo#670445, bgo#670609, + bgo#670967, bgo#670967, bgo#671537, bgo#671874, bgo#671876, + bgo#672175, bgo#673013, bgo#673065, bgo#673067, bgo#673108, + bgo#673123, bgo#673225, bgo#673228, bgo#673420, bgo#673430, + bgo#673525, bgo#674034, bgo#674037, bgo#674060, bgo#674062, + bgo#674176, bgo#674194, bgo#674248, bgo#674249, bgo#674272, + bgo#674282, bgo#674340, bgo#674380, bgo#674381, bgo#674466, + bgo#674701. +- Drop pkgconfig(NetworkManager) BuildRequires: upstream relies on GNetworkMonitor now. - Add pkgconfig(javascriptcoregtk-3.0) and pkgconfig(webkitgtk-3.0) BuildRequires: new dependency to display html mail. +- Fix pkgconfig(gail) BuildRequires to pkgconfig(gail-3.0), which + is really what is wanted. ------------------------------------------------------------------- Tue Aug 14 09:05:30 UTC 2012 - dimstar@opensuse.org diff --git a/evolution.spec b/evolution.spec index 0a8c5e1..6252ca7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,16 +28,15 @@ Name: evolution Version: 3.5.91 Release: 0 # FIXME: check if note on license is still valid (comment before license) -# FIXME: check with upstream/meego if we want to enable clutter for express mode Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite License: LGPL-2.0 ; LGPL-3.0 Group: Productivity/Networking/Email/Clients # NOTE: Some files are currently GPL-2.0 but pending relicensing, see bnc#749859 Url: http://gnome.org/projects/evolution/ Source0: http://download.gnome.org/sources/evolution/3.5/%{name}-%{version}.tar.xz -# PATCH-FIX-OPENSUSE evolution-custom-openldap-includes.patch maw@novell.com -- look for ldap includes in %{_libdir}/evoldap/include +# 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. +# PATCH-NEEDS-REBASE bnc-435722-book-uri-long.patch bnc#435722 abharath@suse.de -- Book URI: Spills Into Second Column. (was PATCH-FIX-UPSTREAM) Patch19: bnc-435722-book-uri-long.patch # 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 @@ -51,18 +50,16 @@ BuildRequires: fdupes %if %USE_EVOLDAP || %{need_autogen} BuildRequires: gnome-common %endif -BuildRequires: gnome-doc-utils-devel >= 0.20.10 BuildRequires: gtk-doc BuildRequires: intltool -BuildRequires: itstool BuildRequires: krb5-devel # don't you ever enable this! It's experimental and insecure (bnc#609013) #BuildRequires: libytnef-devel BuildRequires: psmisc -BuildRequires: python-devel BuildRequires: sqlite3-devel BuildRequires: translation-update-upstream BuildRequires: update-desktop-files +BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(gail-3.0) >= 3.2.0 BuildRequires: pkgconfig(gio-2.0) @@ -76,7 +73,7 @@ BuildRequires: pkgconfig(webkitgtk-3.0) >= 1.8.0 %if %{use_gtkimageview} BuildRequires: pkgconfig(gtkimageview-3.0) %endif -BuildRequires: pkgconfig(gweather-3.0) >= 2.90.0 +BuildRequires: pkgconfig(gweather-3.0) >= 3.5.0 BuildRequires: pkgconfig(ice) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libedataserver-1.2) >= %{version} @@ -93,10 +90,11 @@ BuildRequires: pkgconfig(pangoft2) BuildRequires: pkgconfig(shared-mime-info) >= 0.22 BuildRequires: pkgconfig(sm) Requires: evolution-data-server -Obsoletes: evolution-mono-plugins < %{versiion} -Obsoletes: evolution-python-plugins < %{version} Recommends: %{name}-lang Recommends: bogofilter +# Mono and python plugins were available until evo 3.5.x +Obsoletes: evolution-mono-plugins < %{version} +Obsoletes: evolution-python-plugins < %{version} BuildRoot: %{_tmppath}/%{name}-%{version}-build %glib2_gsettings_schema_requires @@ -136,11 +134,12 @@ to develop applications that require these. %lang_package %prep %setup -q -#translation-update-upstream +translation-update-upstream %if %USE_EVOLDAP %patch15 -p1 %endif -#patch19 +# needs-rebase +#%%patch19 # needs-rebase #%%patch35 @@ -158,8 +157,6 @@ NOCONFIGURE=1 gnome-autogen.sh --with-krb5=%{_prefix} \ --enable-nss=yes \ --enable-smime=yes \ - --enable-mono=yes \ - --enable-python=yes \ --with-glade-catalog \ %if !%{use_gtkimageview} --disable-image-inline \ @@ -181,7 +178,6 @@ find %{buildroot} -name '*.la' -type f -delete -print grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.desktop %suse_update_desktop_file -r -G "Mail and Calendar" -N "Evolution" -D "evolution" evolution GNOME GTK Network Email Calendar ContactManagement %suse_update_desktop_file evolution-alarm-notify -#suse_update_desktop_file -u evolution-settings %find_lang evolution-%evolution_base_version %{?no_lang_C} %find_lang evolution %{?no_lang_C} evolution-%evolution_base_version.lang %if %USE_EVOLDAP