Accepting request 69029 from GNOME:Factory

Pushing G:F (including GNOME3)

OBS-URL: https://build.opensuse.org/request/show/69029
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/evolution?expand=0&rev=104

evolution-2.32.1.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6f6f904b5a2c6cf51f9c44317fc1990b07593eba54957c3924c2db0a235117a3
-size 31875075

evolution-3.0.1.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d322241c38ece00e2ee7adf0c4d0583dc811c52d5a176ef93427b9b35c04487b
+size 31818136

evolution-mime-scheme-handler.patch

@@ -1,133 +0,0 @@
-commit 61999b493fc4266300eab2907909867e73e4cc1e
-Author: Milan Crha <mcrha@redhat.com>
-Date:   Wed Oct 20 15:24:29 2010 +0200
-
-    Bug #631451 - Add handlers for x-scheme-handler/mailto
-
-diff --git a/data/evolution.desktop.in.in b/data/evolution.desktop.in.in
-index d69738e..5fdad27 100644
---- a/data/evolution.desktop.in.in
-+++ b/data/evolution.desktop.in.in
-@@ -14,4 +14,4 @@ X-GNOME-Bugzilla-Product=Evolution
- X-GNOME-Bugzilla-Component=BugBuddyBugs
- X-GNOME-Bugzilla-Version=@BASE_VERSION@.x
- X-GNOME-Bugzilla-OtherBinaries=e-addressbook-factory;e-calendar-factory
--MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;
-+MimeType=text/calendar;text/x-vcard;text/directory;application/mbox;message/rfc822;x-scheme-handler/mailto;
-diff --git a/modules/mailto-handler/evolution-mailto-handler.c b/modules/mailto-handler/evolution-mailto-handler.c
-index 367d9166..01d1bd2 100644
---- a/modules/mailto-handler/evolution-mailto-handler.c
-+++ b/modules/mailto-handler/evolution-mailto-handler.c
-@@ -30,7 +30,9 @@
- 	((obj), E_TYPE_MAILTO_HANDLER, EMailtoHandler))
- 
- #define MAILTO_COMMAND \
--	"evolution --component=mail %s"
-+	"evolution --component=mail"
-+
-+#define MAILTO_HANDLER "x-scheme-handler/mailto"
- 
- typedef struct _EMailtoHandler EMailtoHandler;
- typedef struct _EMailtoHandlerClass EMailtoHandlerClass;
-@@ -63,13 +65,18 @@ mailto_handler_get_shell (EMailtoHandler *extension)
- }
- 
- static gboolean
--mailto_handler_is_evolution (const gchar *mailto_command)
-+mailto_handler_is_evolution (/*const*/ GAppInfo *app_info)
- {
- 	gint argc;
- 	gchar **argv;
- 	gchar *basename;
- 	gboolean is_evolution;
-+	const gchar *mailto_command;
-+
-+	if (app_info == NULL)
-+		return FALSE;
- 
-+	mailto_command = g_app_info_get_commandline (app_info);
- 	if (mailto_command == NULL)
- 		return FALSE;
- 
-@@ -174,14 +181,14 @@ mailto_handler_check (EMailtoHandler *extension)
- 	EShell *shell;
- 	EShellSettings *shell_settings;
- 	gboolean check_mailto_handler = TRUE;
--	gchar *mailto_command = NULL;
-+	GAppInfo *app_info = NULL;
-+	GError *error = NULL;
- 
- 	shell = mailto_handler_get_shell (extension);
- 	shell_settings = e_shell_get_shell_settings (shell);
- 
- 	g_object_get (
- 		shell_settings,
--		"mailto-handler-command", &mailto_command,
- 		"mailto-handler-check", &check_mailto_handler,
- 		NULL);
- 
-@@ -189,25 +196,37 @@ mailto_handler_check (EMailtoHandler *extension)
- 	if (!check_mailto_handler)
- 		goto exit;
- 
-+	app_info = g_app_info_get_default_for_type (MAILTO_HANDLER, FALSE);
-+
- 	/* Is Evolution already handling "mailto" URIs? */
--	if (mailto_handler_is_evolution (mailto_command))
-+	if (mailto_handler_is_evolution (app_info))
- 		goto exit;
- 
- 	/* Does the user want Evolution to handle them? */
- 	if (!mailto_handler_prompt (extension))
- 		goto exit;
- 
-+	if (app_info)
-+		g_object_unref (app_info);
-+
- 	/* Configure Evolution to be the "mailto" URI handler. */
-+	app_info = g_app_info_create_from_commandline (
-+		MAILTO_COMMAND,
-+		_("Evolution"),
-+		G_APP_INFO_CREATE_SUPPORTS_URIS,
-+		&error);
- 
--	g_object_set (
--		shell_settings,
--		"mailto-handler-command", MAILTO_COMMAND,
--		"mailto-handler-enabled", TRUE,
--		"mailto-handler-needs-terminal", FALSE,
--		NULL);
-+	if (app_info && !error)
-+		g_app_info_set_as_default_for_type (app_info, MAILTO_HANDLER, &error);
- 
- exit:
--	g_free (mailto_command);
-+	if (app_info)
-+		g_object_unref (app_info);
-+
-+	if (error) {
-+		g_warning ("Failed to register as default handler: %s", error->message);
-+		g_error_free (error);
-+	}
- }
- 
- static void
-@@ -226,18 +245,6 @@ mailto_handler_constructed (GObject *object)
- 		"mailto-handler-check",
- 		"/apps/evolution/mail/prompts/checkdefault");
- 
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-command",
--		"/desktop/gnome/url-handlers/mailto/command");
--
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-enabled",
--		"/desktop/gnome/url-handlers/mailto/enabled");
--
--	e_shell_settings_install_property_for_key (
--		"mailto-handler-needs-terminal",
--		"/desktop/gnome/url-handlers/mailto/needs_terminal");
--
- 	g_signal_connect_swapped (
- 		shell, "event::ready-to-start",
- 		G_CALLBACK (mailto_handler_check), extension);

evolution-mono2.patch

@@ -1,13 +0,0 @@
-Index: evolution-2.32.1/configure.ac
-===================================================================
---- evolution-2.32.1.orig/configure.ac
-+++ evolution-2.32.1/configure.ac
-@@ -766,7 +766,7 @@ AC_ARG_ENABLE([mono],
- 	[Add Mono embedded hooks.]),
- 	[enable_mono=$enableval],[enable_mono=no])
- if test "x${enable_mono}" = "xyes"; then
--	PKG_CHECK_MODULES([MONO], ["mono"])
-+	PKG_CHECK_MODULES([MONO], ["mono-2"])
- 	AC_DEFINE(ENABLE_MONO,1,[Define if Mono embedding should be enabled])
- fi
- AC_SUBST(MONO_CFLAGS)

evolution.changes

@@ -1,3 +1,236 @@
+-------------------------------------------------------------------
+Wed Apr 27 17:01:22 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.1:
+  + Miscellaneous Fixes:
+    - Don't try to refresh or sync mail folders when offline.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#502188: store 'Remember password' for calendars.
+    - bgo#619782, bgo#648308, bgo#648346, bgo#641154, bgo#648317,
+      bgo#647708, bgo#647116, bgo#645610, bgo#646197, bgo#647816,
+      bgo#647698, bgo#646817.
+  + Updated translations.
+
+-------------------------------------------------------------------
+Wed Apr 27 10:50:06 CEST 2011 - vuntz@opensuse.org
+
+- Onky keep the libmono-2_0-1 BuildRequires for openSUSE 11.4, as
+  the devel package now has a correct dependency for it in Factory.
+
+-------------------------------------------------------------------
+Tue Apr  5 09:15:26 UTC 2011 - fcrozat@novell.com
+
+- Update to version 3.0.0:
+  + Fix translations being broken by removing calls to
+    bindtextdomain() from plugins. It shouldn't be needed for
+    plugins that live in the evolution source tree anyway since
+    they should just use the translation domain they inherit from
+    main().
+  + Bug Fixes:
+    - bgo#646384: Updated App Icon
+    - bgo#646200, bgo#645551.
+- No more svg icon.
+
+-------------------------------------------------------------------
+Tue Apr  5 09:06:07 UTC 2011 - dimstar@opensuse.org
+
+- Add libmono-2_0-1 BuildRequires to workaround an issue on mono
+  packaging. Reported to mono team, will be fixed for Factory.
+
+-------------------------------------------------------------------
+Wed Mar 30 15:36:23 UTC 2011 - fcrozat@novell.com
+
+- Update to version 2.91.92:
+  + Miscellaneous Fixes:
+    - Typo in comment: s/datefime-formats/datetime-formats/
+    - Do not prompt for offline when mail backend not started
+    - Use message subject for attachment description if no filename
+      provided.
+    - Minor glitches in Account Editor
+    - Fix build break after recent eds changes
+    - Fix few invalid reads caused by ECanvas
+    - Save account list when changing account
+    - Select IMAP+ by default in new account setup
+  + Bug Fixes: bgo#223838, bgo#586461, bgo#615204, bgo#618440,
+    bgo#637641, bgo#641939, bgo#643507, bgo#644053, bgo#644066,
+    bgo#644107, bgo#644164, bgo#644166, bgo#644194, bgo#644232,
+    bgo#644235, bgo#644301, bgo#644792.
+- Changes from version 2.91.91:
+  + Other Changes:
+    - Write state.ini immediately in EShellView::dispose method.
+    - Slightly smaller dialogs for Reply type questions (but not
+      all).
+    - Let Esc behave like Cancel in Reply questions and do not leak
+      message.
+    - Do not leak attachments in a mail view.
+    - Merge duplicate local sources.
+    - Do not flush Outbox when mail shell backend not started.
+    - Construct attachment bars for correct message part ids.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#434972: Reply does not detect "RE :" subject prefix.
+    - bgo#550867: Showing location in meetings.
+    - bgo#608804, bgo#614480, bgo#623593, bgo#635002, bgo#637091,
+      bgo#640829, bgo#641343, bgo#641374, bgo#641456, bgo#641805,
+      bgo#642093, bgo#642447, bgo#642954, bgo#643218, bgo#643297,
+      bgo#643402, bgo#643635, bgo#643693.
+- Changes from version 2.91.90:
+  + Miscellaneous Fixes:
+    - Order matters, process master object first, then detached
+      instances.
+    - Slightly nicer EAlertDialog after move to gtk3.
+    - Do not perform the summary consistency check on local
+      folders, 'On this Computer'.
+    - Composer: Add Edit -> Preferences.
+    - Fix image dropping in composer while in HTML mode.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#222423: Support Face headers.
+    - bgo#639483, bgo#639043, bgo#642121, bgo#642566, bgo#638307,
+      bgo#642088, bgo#638478, bgo#638391, bgo#638333, bgo#640802,
+      bgo#255973, bgo#642171, bgo#638057, bgo#637924, bgo#637923,
+      bgo#637727, bgo#637493, bgo#636408, bgo#641502, bgo#641701,
+      bgo#641756, bgo#634571, bgo#641451, bgo#641011, bgo#640801,
+      bgo#635144.
+- Changes from version 2.91.6:
+  + Miscellaneous Fixes:
+    - Most (but not all) packing issues from Mail preferences.
+    - Do not oversize New and Send/Receive toolbar buttons.
+    - Do not hide maildir accounts from UI
+  + Misc code and build changes.
+  + Bug Fixes: bgo#640760, bgo#640707, bgo#640706, bgo#640704,
+    bgo#640536, bgo#640526, bgo#640522, bgo#640516, bgo#640517,
+    bgo#640083, bgo#640025, bgo#640091, bgo#634403, bgo#604534,
+    bgo#633982, bgo#633788, bgo#553438, bgo#600013, bgo#634305,
+    bgo#638087, bgo#638808, bgo#593020.
+- Changes from version 2.91.5:
+  + Other Changes:
+    - Improve wording of Maildir migration dialog.
+    - Improve Maildir migration.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#567879: Add View >> Gallery Option In Email Composer.
+    - bgo#633854, bgo#637482, bgo#637906, bgo#638245.
+- Changes from version 2.91.4:
+  + Miscellaneous Fixes:
+    - Show common addressbook and calendar errors in an alert sink.
+    - Remove duplicated info listed already in Quick Reference PDF
+      anyway.
+    - Remove useless listing of all categories available. No
+      additional value to have that in the docs.
+    - Check for the existence of .Outbox folder while migrating.
+      Make sure the dummy account is created only once.
+    - Free/busy meeting view doesn't work due to non-working
+      extension.
+    - Remove confusing and isolated "Contact list" line.
+    - Set the provider's defaults on when CamelURLs get refreshed
+      with a new protocol.
+    - Avoid a crash when building templates menu.
+    - CalDAV plugin: use saved password, if available, for server
+      browsing.
+    - Default to beginning of the day for the last alarm
+      notification.
+  + Bug Fixes:
+    - bgo#250046: Quote names in addresses when necessary in mail
+      preview.
+    - bgo#436914: Reply to inline GPG quotes raw GPG message.
+    - bgo#634385, bgo#637162, bgo#616452, bgo#633702, bgo#633611,
+      bgo#633332, bgo#631568, bgo#593587, bgo#590245, bgo#627536,
+      bgo#620234, bgo#636265, bgo#635755, bgo#567415, bgo#544328,
+      bgo#608527, bgo#566240, bgo#588572, bgo#587153, bgo#587152,
+      bgo#588570, bgo#634734, bgo#555324, bgo#627176, bgo#621150,
+      bnc#602183, bgo#636058.
+- Changes from version 2.91.3:
+  + Miscellaneous Fixes:
+    - [vCard-inline] Check also text/directory parts.
+    - Reset IM context when entering ECellText editing.
+    - Maildir migration: allow subfolders for Inbox.
+    - Migrate the local store from mbox to maildir format.
+    - Workaround crash when pasting nothing into html message
+      composer.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#207580: Allow new mail check on individual accounts.
+    - bgo#635828, bgo#635738, bgo#634387, bgo#635673, bgo#632962,
+      bgo#371705, bgo#635087, bgo#633783, bgo#633779, bgo#633774,
+      bgo#632781, bgo#632683, bgo#632293, bgo#632676, bgo#632671,
+      bgo#632176.
+- Changes from version 2.91.2:
+  + Other Changes:
+    - Crash on start with vfolders configured
+    - Port gnome-canvas drawing from GDK to cairo.
+    - Skip writing to Outbox when sending.
+    - Add missing stock appointment-reminder icons
+    - Move calendar preferences to the calendar module.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#445439: Delete mail from pop-server when deleted from
+      Inbox/Trash.
+    - bgo#484554: Day names can overlap in calendar printouts.
+    - bgo#534453: Incorporate 'Remove attachments' plugin.
+    - bgo#567265: BCC kept on message forward from Sent folder.
+    - bgo#592045: Use week-day names in abbreviated date.
+    - bgo#612181: Show recurring events in italic in date
+      navigator.
+    - bgo#597567, bgo#628139, bgo#629479, bgo#630504, bgo#630695,
+      bgo#630969, bgo#631451, bgo#631526, bgo#631731, bgo#631870,
+      bgo#631956, bgo#631981, bgo#631982, bgo#632199, bgo#632278,
+      bgo#632280, bgo#632562, bgo#632580, bgo#632641, bgo#632679,
+      bgo#632767, bgo#632768, bgo#632769, bgo#632870, bgo#632903,
+      bgo#632941, bgo#633155, bgo#633158, bgo#633172, bgo#633371,
+      bgo#633471, bgo#634088.
+- Changes from version 2.91.1:
+  + Miscellaneous Fixes:
+    - EAlertBar: Always show the most recent alert.
+    - Composer: Show cancellable operations and errors inline.
+    - Day view print: Put day name in its box
+    - Add a missing week number offset
+    - MailFolderCache notifies in reverse order
+    - Calendar's "Open Web Page" actions doesn't work
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#587011: Integrate remove-duplicates into evolution.
+    - bgo#240302: Print the work week view
+    - bgo#223337: Auto-close message-browser when replying to them.
+    - bgo#552121: Drop UUENCODE inline filter.
+    - bgo#617953: Hide Junk messages in Search folders.
+    - bgo#211593: Show week numbers on calendar printout.
+    - bgo#630506, bgo#631968, bgo#604981, bgo#632171, bgo#632127,
+      bgo#305425, bgo#461769, bgo#630490, bgo#630375, bgo#617611,
+      bgo#619387, bgo#631341, bgo#631588, bgo#631320, bgo#630390,
+      bgo#618102, bgo#500591, bgo#588851, bgo#630295, bgo#629825,
+      bgo#615835, bgo#616250.
+- Changes from version 2.91.0:
+  + Other Changes:
+    - Convert plugin-manager to an EExtension.
+    - Remove uninteresting mail options from Preferences.
+    - Reorganize composer preferences
+    - Kill the subject-thread plugin.
+    - Rewrite the folder subscription editor.
+  + Misc code and build changes.
+  + Bug Fixes:
+    - bgo#346438: Error dialog too wide.
+    - bgo#510020, bgo#563471, bgo#604080, bgo#611154, bgo#616250,
+      bgo#624321, bgo#626066, bgo#626066, bgo#628522, bgo#629150,
+      bgo#629266, bgo#629462, bgo#629480, bgo#629482, bgo#629636,
+      bgo#629645, bgo#629735, bgo#629737, bgo#629799, bgo#629934,
+      bgo#629972, bgo#630118, bgo#630269, bgo#630294, bgo#630700.
+- Drop evolution-mime-scheme-handler.patch: fixed upstream
+- Drop evolution-mono2.patch: fixed upstream.
+- Disable glade3 catalog support with a glade_catalog define, until
+  we have a working gtk3 glade.
+- Update BuildRequires to GTK3/GNOME3 counterpart
+- Update pkgconfig() BuildRequires for GNOME 3:
+  + Old ones: gnome-desktop-2.0, gtk+-2.0, gweather,
+    libcanberra-gtk, libedataserverui-1.2, libgtkhtml-3.14,
+    unique-1.0.
+  + New ones: gnome-desktop-3.0, gtk+-3.0, gweather-3.0,
+    libcanberra-gtk3, libedataserverui-3.0, libgtkhtml-4.0,
+    unique-3.0.
+- Disable image-inline support with a use_gtkimageview define,
+  until gktimageview is ported to gtk3.
+
 -------------------------------------------------------------------
 Thu Feb 17 08:37:57 UTC 2011 - yvibha@novell.com
 

evolution.spec

@@ -17,6 +17,9 @@
 
 
 %define USE_EVOLDAP 0
+%define glade_catalog 0
+# wait for port of gtkimageview to gtk3
+%define use_gtkimageview 0
 
 Name:           evolution
 BuildRequires:  bison
@@ -43,18 +46,22 @@ BuildRequires:  pkgconfig(atk)
 BuildRequires:  pkgconfig(gail)
 BuildRequires:  pkgconfig(gconf-2.0)
 BuildRequires:  pkgconfig(gio-2.0)
-BuildRequires:  pkgconfig(gladeui-1.0)
+%if %{glade_catalog}
-BuildRequires:  pkgconfig(gnome-desktop-2.0)
+BuildRequires:  pkgconfig(gladeui-2.0)
+%endif
+BuildRequires:  pkgconfig(gnome-desktop-3.0)
 BuildRequires:  pkgconfig(gnome-icon-theme)
 BuildRequires:  pkgconfig(gstreamer-0.10)
-BuildRequires:  pkgconfig(gtk+-2.0)
+BuildRequires:  pkgconfig(gtk+-3.0)
-BuildRequires:  pkgconfig(gtkimageview)
+%if %{use_gtkimageview}
-BuildRequires:  pkgconfig(gweather)
+BuildRequires:  pkgconfig(gtkimageview-3.0)
-BuildRequires:  pkgconfig(libcanberra-gtk)
+%endif
+BuildRequires:  pkgconfig(gweather-3.0)
+BuildRequires:  pkgconfig(libcanberra-gtk3)
 BuildRequires:  pkgconfig(libedataserver-1.2)
-BuildRequires:  pkgconfig(libedataserverui-1.2)
+BuildRequires:  pkgconfig(libedataserverui-3.0)
 BuildRequires:  pkgconfig(libgdata)
-BuildRequires:  pkgconfig(libgtkhtml-3.14)
+BuildRequires:  pkgconfig(libgtkhtml-4.0)
 BuildRequires:  pkgconfig(libnotify)
 BuildRequires:  pkgconfig(libpst)
 BuildRequires:  pkgconfig(libsoup-2.4)
@@ -63,27 +70,22 @@ BuildRequires:  pkgconfig(nspr)
 BuildRequires:  pkgconfig(nss)
 BuildRequires:  pkgconfig(pangoft2)
 BuildRequires:  pkgconfig(shared-mime-info)
-BuildRequires:  pkgconfig(unique-1.0)
+BuildRequires:  pkgconfig(unique-3.0)
 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 2.32
+%define evolution_base_version 3.0
-Version:        2.32.1
+Version:        3.0.1
-Release:        11
+Release:        1
-# FIXME: Check if libmono-2_0-1 is dragged in by libmono-2_0-devel, then remove this BR (in mono-plugins subpackage).
 # 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:        ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar.bz2
-# PATCH-FIX-UPSTREAM evolution-mime-scheme-handler.patch bgo#631451 vuntz@opensuse.org -- Taken from git, register mailto-related mime type
-Patch0:         evolution-mime-scheme-handler.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-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.
 Patch35:        bnc-210959-evo-accept-ics.patch
-# PATCH-FIX-UPSTREAM evolution-mono2.patch dimstar@opensuse.org -- Build against mono-2. Patch is not ready to be upstreamed in this form.
-Patch55:        evolution-mono2.patch
 Url:            http://gnome.org/projects/evolution/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Recommends:     %{name}-lang
@@ -96,6 +98,7 @@ calendar, and address book) that should make daily life easier. Because
 of the modular design, it is possible to plug new components into
 Evolution or embed the existing ones in other applications.
 
+%if %{glade_catalog}
 %package -n glade3-catalog-evolution
 License:        LGPLv2.0 ; LGPLv3
 Summary:        Evolution Library -- Catalog for Glade
@@ -112,6 +115,7 @@ Evolution or embed the existing ones in other applications.
 
 This package provides a catalog for Glade, to allow the use of Evolution
 widgets in Glade.
+%endif
 
 %package devel
 License:        LGPLv2.0 ; LGPLv3
@@ -139,8 +143,11 @@ BuildRequires:  glib-sharp2
 BuildRequires:  gnome-sharp2
 BuildRequires:  gtk-sharp2
 %if 0%{?suse_version} > 1130
+%if 0%{?suse_version} <= 1140
+# Workaround a bug in mono packaging: the -devel package does not drag in the lib.
 BuildRequires:  libmono-2_0-1
-BuildRequires:  libmono-2_0-devel
+%endif
+BuildRequires:  pkgconfig(mono-2)
 %else
 BuildRequires:  mono-devel
 %endif
@@ -169,18 +176,15 @@ Evolution or embed the existing ones in other applications.
 %prep
 %setup -q
 translation-update-upstream
-%patch0 -p1
 %if %USE_EVOLDAP
 %patch15 -p1
 %endif
 %patch19
 %patch35
-%if %{?suse_version} > 1130
-%patch55 -p1
-%endif
 
 %build
 autoreconf -f -i
+intltoolize --copy --force
 %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in
 %{configure} \
     --disable-scrollkeeper \
@@ -194,13 +198,18 @@ autoreconf -f -i
     --enable-smime=yes \
     --enable-mono=yes \
     --enable-python=yes \
+%if %{glade_catalog}
     --with-glade-catalog \
+%endif
+%if !%{use_gtkimageview}
+    --disable-image-inline \
+%endif
     --disable-static
 # Processing the files in help uses _lots_ of memory, so running that part in parallel is bad.
 pushd help
 %{__make}
 popd
-%{__make} %{?jobs:-j%jobs}
+%{__make} %{?jobs:-j%jobs} V=1
 
 %install
 %{makeinstall}
@@ -255,7 +264,6 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_datadir}/applications/*.desktop
 %{_datadir}/evolution
 %{_datadir}/icons/hicolor/*/apps/*.png
-%{_datadir}/icons/hicolor/scalable/apps/*.svg
 %dir %{_libdir}/evolution
 %dir %{_libdir}/evolution/*
 %{_libdir}/evolution/*/*.so.*
@@ -265,7 +273,9 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/modules/*-module-composer-autosave.*
 %{_libdir}/evolution/*/modules/*-module-mail.*
 %{_libdir}/evolution/*/modules/*-module-mailto-handler.*
+%{_libdir}/evolution/*/modules/*-module-offline-alert.*
 %{_libdir}/evolution/*/modules/*-module-plugin-lib.*
+%{_libdir}/evolution/*/modules/*-module-plugin-manager.*
 %{_libdir}/evolution/*/modules/*-module-startup-wizard.*
 %{_libdir}/evolution/*/modules/*-module-network-manager.*
 %dir %{_libdir}/evolution/*/plugins
@@ -285,7 +295,10 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/plugins/*-evolution-webdav.*
 %{_libdir}/evolution/*/plugins/*-gnome-audio-inline.*
 %{_libdir}/evolution/*/plugins/*-gnome-dbx-import.*
+%{_libdir}/evolution/*/plugins/*-gnome-face.*
+%if %{use_gtkimageview}
 %{_libdir}/evolution/*/plugins/*-gnome-image-inline.*
+%endif
 %{_libdir}/evolution/*/plugins/*-gnome-vcard-inline.*
 %{_libdir}/evolution/*/plugins/*-groupwise-features.*
 %{_libdir}/evolution/*/plugins/*-imap-features.*
@@ -294,13 +307,11 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 %{_libdir}/evolution/*/plugins/*-mail-notification.*
 %{_libdir}/evolution/*/plugins/*-mail-to-task.*
 %{_libdir}/evolution/*/plugins/*-mark-all-read.*
-%{_libdir}/evolution/*/plugins/*-plugin-manager.*
 %{_libdir}/evolution/*/plugins/*-prefer-plain.*
 %{_libdir}/evolution/*/plugins/*-pst-import.*
 %{_libdir}/evolution/*/plugins/*-publish-calendar.*
 %{_libdir}/evolution/*/plugins/*-sa-junk-plugin.*
 %{_libdir}/evolution/*/plugins/*-save-calendar.*
-%{_libdir}/evolution/*/plugins/*-subject-thread.*
 %{_libdir}/evolution/*/plugins/*-templates.*
 %dir %{_libexecdir}/evolution
 %dir %{_libexecdir}/evolution/*
@@ -311,10 +322,12 @@ grep -q "^Categories=.*Office" %{buildroot}%{_datadir}/applications/evolution.de
 
 %files lang -f evolution-%evolution_base_version.lang
 
+%if %{glade_catalog}
 %files -n glade3-catalog-evolution
 %defattr(-,root,root)
 %{_libdir}/glade3/modules/libgladeevolution.so
 %{_datadir}/glade3/catalogs/evolution.xml
+%endif
 
 %files devel
 %defattr(-,root,root)