.evolution.metadata

@@ -1,2 +1 @@
-2ad33472d280d83737884a0e60a9236793653111 SOURCES/emoji.data
-2b480d7dd297d84c1b1321f5c90bd0e35d566433 SOURCES/evolution-3.40.4.tar.xz
+67e94ffe2360fd71e60c996ea83b57ed2a97ead5  SOURCES/evolution-3.54.2.tar.xz

.gitignore

@@ -1,2 +1 @@
-SOURCES/emoji.data
-SOURCES/evolution-3.40.4.tar.xz
+SOURCES/evolution-3.54.2.tar.xz

SOURCES/configurable-dbus-prefix.patch

@@ -0,0 +1,42 @@
+diff -up evolution-3.48.1 evolution-3.48
+diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
+diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
+--- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1	2023-11-27 13:12:25.099463743 -0500
++++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c	2023-11-27 13:14:38.640243434 -0500
+@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
+ 			g_string_free (tmp, TRUE);
+ 			tmp = NULL;
+ 
+-			base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
++			base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
+ 
+ 			if (!base_filename || !*base_filename) {
+ 				g_free (base_filename);
+@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
+ 
+ 			while (!tmp) {
+ 				const gchar *name;
++				gchar *name_down;
+ 
+ 				name = g_dir_read_name (dir);
++				name_down = g_ascii_strdown (name, -1);
+ 
+ 				if (!name)
+ 					break;
+ 
+-				if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
+-				    g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
++				if (strstr (name_down, base_filename) != NULL &&
++				    strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
+ 					gchar *filename;
+ 
+ 					filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
+@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
+ 						g_free (str);
+ 					}
+ 				}
++
++				g_free (name_down);
+ 			}
+ 
+ 			g_free (base_filename);

SOURCES/evolution-3.40.4-comp-editor-timezone-reset.patch

@@ -1,68 +0,0 @@
-From 9bbb9289477c8a61a641b0b67cec367629f1e73a Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 10 Feb 2022 11:59:36 +0100
-Subject: [PATCH] ECompEditor: Timezone can be reset on component save
-
-The libical 3.0.14 contains a change, which unsets non-UTC timezones
-in date/time values. That uncovered a bug in the Evolution code, which
-expects the timezone will be preserved on re-read from the component,
-but it's not always possible. This is corrected by re-setting the timezone
-on the used ICalTime value.
----
- src/calendar/gui/e-comp-editor-property-part.c | 18 ++++++++++++++++++
- 1 file changed, 18 insertions(+)
-
-diff --git a/src/calendar/gui/e-comp-editor-property-part.c b/src/calendar/gui/e-comp-editor-property-part.c
-index 6bed833b12..6ce699a2e6 100644
---- a/src/calendar/gui/e-comp-editor-property-part.c
-+++ b/src/calendar/gui/e-comp-editor-property-part.c
-@@ -913,8 +913,15 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
- 			g_object_unref (prop);
- 		}
- 	} else {
-+		ICalTimezone *zone;
-+
- 		value = e_comp_editor_property_part_datetime_get_value (part_datetime);
- 
-+		zone = value && !i_cal_time_is_null_time (value) ? i_cal_time_get_timezone (value) : NULL;
-+
-+		if (zone)
-+			g_object_ref (zone);
-+
- 		if (prop) {
- 			/* Remove the VALUE parameter, to correspond to the actual value being set */
- 			i_cal_property_remove_parameter_by_kind (prop, I_CAL_VALUE_PARAMETER);
-@@ -925,6 +932,11 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
- 			g_clear_object (&value);
- 			value = klass->i_cal_get_func (prop);
- 
-+			/* The timezone can be dropped since libical 3.0.14, thus restore it
-+			   before updating the TZID parameter */
-+			if (zone && value && !i_cal_time_is_null_time (value) && !i_cal_time_is_date (value))
-+				i_cal_time_set_timezone (value, zone);
-+
- 			cal_comp_util_update_tzid_parameter (prop, value);
- 		} else {
- 			prop = klass->i_cal_new_func (value);
-@@ -933,12 +945,18 @@ ecepp_datetime_fill_component (ECompEditorPropertyPart *property_part,
- 			g_clear_object (&value);
- 			value = klass->i_cal_get_func (prop);
- 
-+			/* The timezone can be dropped since libical 3.0.14, thus restore it
-+			   before updating the TZID parameter */
-+			if (zone && value && !i_cal_time_is_null_time (value) && !i_cal_time_is_date (value))
-+				i_cal_time_set_timezone (value, zone);
-+
- 			cal_comp_util_update_tzid_parameter (prop, value);
- 			i_cal_component_add_property (component, prop);
- 		}
- 
- 		g_clear_object (&value);
- 		g_clear_object (&prop);
-+		g_clear_object (&zone);
- 	}
- }
- 
--- 
-2.33.1
-

SOURCES/evolution-3.40.4-empty-emoji-picker.patch

@@ -1,56 +0,0 @@
-From e75c4faa36a9eb17b88128e45f9e5d91628149f9 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 4 Oct 2021 17:18:35 +0200
-Subject: I#1646 - Emoji picker empty
-
-Embed emoji.data as expected by the copy of the gtk+' emoji chooser dialog.
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1646
-
-diff --git a/data/org.gnome.Evolution.gresource.xml b/data/org.gnome.Evolution.gresource.xml
-new file mode 100644
-index 0000000000..783ed153b8
---- /dev/null
-+++ b/data/org.gnome.Evolution.gresource.xml
-@@ -0,0 +1,6 @@
-+<?xml version='1.0' encoding='UTF-8'?>
-+<gresources>
-+  <gresource prefix="org.gnome.Evolution">
-+    <file>emoji.data</file>
-+  </gresource>
-+</gresources>
-diff --git a/src/e-util/CMakeLists.txt b/src/e-util/CMakeLists.txt
-index 03b60d8e4b..6f63f29858 100644
---- a/src/e-util/CMakeLists.txt
-+++ b/src/e-util/CMakeLists.txt
-@@ -30,6 +30,8 @@ if(WIN32)
- 	)
- endif(WIN32)
- 
-+glib_compile_resources(${CMAKE_SOURCE_DIR}/data/ ${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource org_gnome_evolution ../../data/org.gnome.Evolution.gresource.xml ${CMAKE_SOURCE_DIR}/data/emoji.data)
-+
- # Main libevolution-util
- 
- set(DEPENDENCIES
-@@ -309,6 +311,8 @@ set(SOURCES
- 	${PLATFORM_SOURCES}
- 	${CMAKE_CURRENT_BINARY_DIR}/e-marshal.c
- 	${CMAKE_CURRENT_BINARY_DIR}/e-util-enumtypes.c
-+	${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.c
-+	${CMAKE_CURRENT_BINARY_DIR}/org.gnome.Evolution.gresource.h
- )
- 
- set(HEADERS
-diff --git a/src/e-util/e-gtkemojichooser.c b/src/e-util/e-gtkemojichooser.c
-index ba4d15ecee..7d8aae3039 100644
---- a/src/e-util/e-gtkemojichooser.c
-+++ b/src/e-util/e-gtkemojichooser.c
-@@ -444,7 +444,7 @@ populate_emoji_chooser (gpointer data)
- 
-   if (!chooser->data)
-     {
--      bytes = g_resources_lookup_data ("/org/gtk/libgtk/emoji/emoji.data", 0, NULL);
-+      bytes = g_resources_lookup_data ("/org.gnome.Evolution/emoji.data", 0, NULL);
-       chooser->data = g_variant_ref_sink (g_variant_new_from_bytes (G_VARIANT_TYPE ("a(auss)"), bytes, TRUE));
-     }
- 

SOURCES/evolution-3.40.4-frame-flattenning.patch

@@ -1,468 +0,0 @@
-diff -up evolution-3.40.4/data/webkit/e-web-view.js.6 evolution-3.40.4/data/webkit/e-web-view.js
---- evolution-3.40.4/data/webkit/e-web-view.js.6	2023-01-03 18:41:01.198700722 +0100
-+++ evolution-3.40.4/data/webkit/e-web-view.js	2023-01-03 18:41:01.215700736 +0100
-@@ -730,6 +730,38 @@ Evo.EnsureMainDocumentInitialized = func
- 	Evo.initializeAndPostContentLoaded(null);
- }
- 
-+Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
-+{
-+	if (!doc)
-+		return;
-+
-+	var ii, iframes;
-+
-+	iframes = doc.getElementsByTagName("iframe");
-+
-+	/* Update from bottom to top */
-+	for (ii = 0; ii < iframes.length; ii++) {
-+		Evo.mailDisplayUpdateIFramesHeightRecursive(iframes[ii].contentDocument);
-+	}
-+
-+	if (!doc.scrollingElement || !doc.defaultView || !doc.defaultView.frameElement)
-+		return;
-+
-+	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight)
-+		doc.defaultView.frameElement.height = 10;
-+	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? 20 : 0);
-+}
-+
-+Evo.MailDisplayUpdateIFramesHeight = function()
-+{
-+	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
-+
-+	Evo.mailDisplayUpdateIFramesHeightRecursive(document);
-+
-+	if (scrolly != -1 && document.defaultView.scrollY != scrolly)
-+		document.defaultView.scrollTo(0, scrolly);
-+}
-+
- if (this instanceof Window && this.document) {
- 	this.document.onload = function() { Evo.initializeAndPostContentLoaded(this); };
- 
-@@ -815,9 +847,8 @@ Evo.mailDisplayResizeContentToPreviewWid
- 				local_width -= 2; /* 1 + 1 frame borders */
- 			} else if (!iframes.length) {
- 				/* Message main body */
--				local_width -= 8; /* 8 + 8 margins of body without iframes */
--				if (level > 1)
--					local_width -= 8;
-+				local_width -= level * 20; /* 10 + 10 margins of body without iframes */
-+				local_width -= 4;
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body", "width: " + local_width + "px;");
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container", "width: " + local_width + "px;");
-@@ -827,7 +858,7 @@ Evo.mailDisplayResizeContentToPreviewWid
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body",
- 					"width: " + local_width + "px;");
- 
--				local_width -= 2; /* 1 + 1 frame borders */
-+				local_width -= 4; /* 2 + 2 frame borders */
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container-nostyle iframe",
- 					"width: " + local_width + "px;");
-@@ -839,19 +870,15 @@ Evo.mailDisplayResizeContentToPreviewWid
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container iframe",
- 					"width: " + (local_width - 10) + "px;");
- 			} else {
--				local_width -= 20; /* 10 + 10 margins of body with iframes */
--				local_width -= 8; /* attachment margin */
--				local_width -= 2; /* 1 + 1 frame borders */
-+				local_width -= (level - 1) * 20; /* 10 + 10 margins of body with iframes */
-+				local_width -= 4; /* 2 + 2 frame borders */
-+				local_width -= 10; /* attachment margin */
- 
--				/* We need to subtract another 10 pixels from the iframe width to
--				 * have the iframe's borders on the correct place. We can't subtract
--				 * it from local_width as we don't want to propagate this change
--				 * further. */
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".part-container-nostyle iframe",
--					"width: " + (local_width - 10) + "px;");
-+					"width: " + local_width + "px;");
- 
- 				Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body > .part-container-nostyle iframe",
--					"width: " + (local_width - 10) + "px;");
-+					"width: " + local_width + "px;");
- 			}
- 
- 			/* Add rules to every sub document */
-@@ -862,7 +889,7 @@ Evo.mailDisplayResizeContentToPreviewWid
- 				var tmp_local_width = local_width;
- 
- 				if (level == 0) {
--					tmp_local_width -= 8; /* attachment's margin */
-+					tmp_local_width -= 10; /* attachment's margin */
- 
- 					Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", ".attachment-wrapper iframe:not([src*=\"__formatas=\"])",
- 						"width: " + tmp_local_width + "px;");
-@@ -871,7 +898,7 @@ Evo.mailDisplayResizeContentToPreviewWid
- 						"width: " + tmp_local_width + "px;");
- 
- 					Evo.addRuleIntoStyleSheetDocument(doc, "-e-mail-formatter-style-sheet", "body > .part-container-nostyle iframe",
--						"width: " + local_width + "px;");
-+						"width: " + tmp_local_width + "px;");
- 				}
- 
- 				this.set_iframe_and_body_width (iframes[ii].contentDocument, tmp_local_width, original_width, level + 1);
-@@ -884,6 +911,7 @@ Evo.mailDisplayResizeContentToPreviewWid
- 	width -= 20; /* 10 + 10 margins of body */
- 
- 	traversar.set_iframe_and_body_width(document, width, width, 0);
-+	window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- }
- 
- Evo.mailDisplayUpdateMagicSpacebarState = function()
-@@ -1249,6 +1277,8 @@ Evo.MailDisplayShowAttachment = function
- 			window.webkit.messageHandlers.contentLoaded.postMessage(iframe_id);
- 			Evo.mailDisplayUpdateMagicSpacebarState();
- 		}
-+	} else if (elem.ownerDocument.defaultView.frameElement) {
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1343,8 +1373,10 @@ EvoItip.SetElementInnerHTML = function(i
- {
- 	var elem = Evo.FindElement(iframe_id, element_id);
- 
--	if (elem)
-+	if (elem) {
- 		elem.innerHTML = html_content;
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
-+	}
- }
- 
- EvoItip.SetShowCheckbox = function(iframe_id, element_id, show, update_second)
-@@ -1370,6 +1402,8 @@ EvoItip.SetShowCheckbox = function(ifram
- 		if (elem) {
- 			elem.hidden = !show;
- 		}
-+
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1383,6 +1417,8 @@ EvoItip.SetAreaText = function(iframe_id
- 		if (row.lastElementChild) {
- 			row.lastElementChild.innerHTML = text;
- 		}
-+
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1400,6 +1436,8 @@ EvoItip.UpdateTimes = function(iframe_id
- 		if (elem.lastElementChild) {
- 			elem.lastElementChild.innerHTML = label;
- 		}
-+
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1427,6 +1465,8 @@ EvoItip.AppendInfoRow = function(iframe_
- 
- 	cell = row.insertCell(-1);
- 	cell.innerHTML = message;
-+
-+	window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- }
- 
- EvoItip.RemoveInfoRow = function(iframe_id, row_id)
-@@ -1435,6 +1475,7 @@ EvoItip.RemoveInfoRow = function(iframe_
- 
- 	if (row && row.parentNode) {
- 		row.parentNode.removeChild(row);
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1446,6 +1487,8 @@ EvoItip.RemoveChildNodes = function(ifra
- 		while (elem.lastChild) {
- 			elem.removeChild(elem.lastChild);
- 		}
-+
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-@@ -1498,6 +1541,8 @@ EvoItip.HideButtons = function(iframe_id
- 			if (button)
- 				button.hidden = true;
- 		}
-+
-+		window.webkit.messageHandlers.scheduleIFramesHeightUpdate.postMessage(0);
- 	}
- }
- 
-diff -up evolution-3.40.4/data/webkit/webview.css.6 evolution-3.40.4/data/webkit/webview.css
---- evolution-3.40.4/data/webkit/webview.css.6	2021-08-13 11:50:35.000000000 +0200
-+++ evolution-3.40.4/data/webkit/webview.css	2023-01-03 18:41:01.214700735 +0100
-@@ -12,8 +12,8 @@ img {
- }
- 
- body {
--  /* Use margin so that children can safely use width=100% */
--  margin: 5px 10px 5px 10px;
-+  /* Use padding so that children can safely use width=100% */
-+  padding: 8px;
- }
- 
- body, div, p, td {
-@@ -38,21 +38,21 @@ img#__evo-contact-photo {
- 
- img.navigable {
-   cursor: pointer;
--  margin-right: 4px;
-+  padding-right: 4px;
- }
- 
- .attachments {
-   background: #FFF;
-   border: 1px solid silver;
--  margin: 10px 10px 10px 10px;
-+  padding: 10px 10px 10px 10px;
-   border-left: 0;
-   border-right: 0;
-   border-bottom: 0;
- }
- 
- .attachment {
--  margin-left: 8px;
--  margin-right: 0px;
-+  padding-left: 8px;
-+  padding-right: 0px;
- }
- 
- .attachment td {
-@@ -66,21 +66,21 @@ iframe:not([id$=".itip"]) {
- 
- .part-container {
-   height: 100%;
--  margin-top: 2px;
--  margin-bottom: 2px;
-+  padding: 0px;
- }
- 
- .part-container-nostyle iframe {
--  margin-right: 10px;
-+  margin: 0px;
-+  padding-right: 0px;
- }
- 
- .part-container-inner-margin {
--  margin: 8px;
-+  padding: 0px;
- }
- 
- object { /* GtkWidgets */
--  margin-top: 2px;
--  margin-bottom: 2px;
-+  padding-top: 2px;
-+  padding-bottom: 2px;
- }
- 
- .__evo-highlight {
-@@ -166,7 +166,7 @@ th.rtl {
- /***** PRINTING *******/
- 
- .printing-header {
--  margin-bottom: 20px;
-+  padding-bottom: 20px;
- }
- 
- .printing-header h1,
-@@ -186,7 +186,7 @@ th.rtl {
- /******* ITIP *********/
- .itip.icon {
-   float: left;
--  margin-right: 5px;
-+  padding-right: 5px;
- }
- 
- .itip.content {
-@@ -195,7 +195,7 @@ th.rtl {
- }
- 
- .itip.description {
--  margin: 5px;
-+  padding: 5px;
- }
- 
- .itip tr {
-@@ -219,7 +219,7 @@ th.rtl {
- }
- 
- #table_row_buttons img {
--  margin-right: 5px;
-+  padding-right: 5px;
-   vertical-align: middle;
- }
- 
-diff -up evolution-3.40.4/src/em-format/e-mail-formatter-text-plain.c.6 evolution-3.40.4/src/em-format/e-mail-formatter-text-plain.c
---- evolution-3.40.4/src/em-format/e-mail-formatter-text-plain.c.6	2021-08-13 11:50:35.000000000 +0200
-+++ evolution-3.40.4/src/em-format/e-mail-formatter-text-plain.c	2023-01-03 18:41:01.214700735 +0100
-@@ -111,7 +111,7 @@ emfe_text_plain_format (EMailFormatterEx
- 		string =
- 			"<div class=\"part-container pre "
- 			"-e-web-view-background-color -e-web-view-text-color\" "
--			"style=\"border: none; padding: 8px; margin: 0;\">";
-+			"style=\"border: none; padding: 0; margin: 0;\">";
- 
- 		g_output_stream_write_all (
- 			stream, string, strlen (string),
-diff -up evolution-3.40.4/src/mail/e-mail-display.c.6 evolution-3.40.4/src/mail/e-mail-display.c
---- evolution-3.40.4/src/mail/e-mail-display.c.6	2021-08-13 11:50:35.000000000 +0200
-+++ evolution-3.40.4/src/mail/e-mail-display.c	2023-01-03 18:41:01.215700736 +0100
-@@ -83,6 +83,7 @@ struct _EMailDisplayPrivate {
- 	GSettings *settings;
- 
- 	guint scheduled_reload;
-+	guint iframes_height_update_id;
- 
- 	GHashTable *old_settings;
- 
-@@ -537,6 +538,43 @@ initialize_web_view_colors (EMailDisplay
- 		e_web_view_get_cancellable (E_WEB_VIEW (display)));
- }
- 
-+static gboolean
-+mail_display_can_use_frame_flattening (void)
-+{
-+	guint wk_major, wk_minor;
-+
-+	wk_major = webkit_get_major_version ();
-+	wk_minor = webkit_get_minor_version ();
-+
-+	/* The 2.38 is the last version, which supports frame-flattening;
-+	   prefer it over the manual and expensive calculations. */
-+	return (wk_major < 2) || (wk_major == 2 && wk_minor <= 38);
-+}
-+
-+static gboolean
-+mail_display_iframes_height_update_cb (gpointer user_data)
-+{
-+	EMailDisplay *mail_display = user_data;
-+
-+	mail_display->priv->iframes_height_update_id = 0;
-+
-+	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (mail_display), e_web_view_get_cancellable (E_WEB_VIEW (mail_display)),
-+		"Evo.MailDisplayUpdateIFramesHeight();");
-+
-+	return G_SOURCE_REMOVE;
-+}
-+
-+static void
-+mail_display_schedule_iframes_height_update (EMailDisplay *mail_display)
-+{
-+	if (mail_display_can_use_frame_flattening ())
-+		return;
-+
-+	if (mail_display->priv->iframes_height_update_id)
-+		g_source_remove (mail_display->priv->iframes_height_update_id);
-+	mail_display->priv->iframes_height_update_id = g_timeout_add (100, mail_display_iframes_height_update_cb, mail_display);
-+}
-+
- static void
- mail_display_change_one_attachment_visibility (EMailDisplay *display,
- 					       EAttachment *attachment,
-@@ -1353,6 +1391,8 @@ mail_display_content_loaded_cb (EWebView
- 			gtk_widget_grab_focus (widget);
- 		}
- 	}
-+
-+	mail_display_schedule_iframes_height_update (mail_display);
- }
- 
- static void
-@@ -1475,6 +1515,11 @@ mail_display_dispose (GObject *object)
- 		priv->scheduled_reload = 0;
- 	}
- 
-+	if (priv->iframes_height_update_id > 0) {
-+		g_source_remove (priv->iframes_height_update_id);
-+		priv->iframes_height_update_id = 0;
-+	}
-+
- 	if (priv->settings != NULL) {
- 		g_signal_handlers_disconnect_matched (
- 			priv->settings, G_SIGNAL_MATCH_DATA,
-@@ -1600,6 +1645,18 @@ mail_display_magic_spacebar_state_change
- }
- 
- static void
-+mail_display_schedule_iframes_height_update_cb (WebKitUserContentManager *manager,
-+						WebKitJavascriptResult *js_result,
-+						gpointer user_data)
-+{
-+	EMailDisplay *mail_display = user_data;
-+
-+	g_return_if_fail (mail_display != NULL);
-+
-+	mail_display_schedule_iframes_height_update (mail_display);
-+}
-+
-+static void
- mail_display_constructed (GObject *object)
- {
- 	EContentRequest *content_request;
-@@ -1611,9 +1668,11 @@ mail_display_constructed (GObject *objec
- 	/* Chain up to parent's constructed() method. */
- 	G_OBJECT_CLASS (e_mail_display_parent_class)->constructed (object);
- 
--	g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (object)),
--		"enable-frame-flattening", TRUE,
--		NULL);
-+	if (mail_display_can_use_frame_flattening ()) {
-+		g_object_set (webkit_web_view_get_settings (WEBKIT_WEB_VIEW (object)),
-+			"enable-frame-flattening", TRUE,
-+			NULL);
-+	}
- 
- 	display = E_MAIL_DISPLAY (object);
- 	web_view = E_WEB_VIEW (object);
-@@ -1661,8 +1720,12 @@ mail_display_constructed (GObject *objec
- 	g_signal_connect_object (manager, "script-message-received::mailDisplayMagicSpacebarStateChanged",
- 		G_CALLBACK (mail_display_magic_spacebar_state_changed_cb), display, 0);
- 
-+	g_signal_connect_object (manager, "script-message-received::scheduleIFramesHeightUpdate",
-+		G_CALLBACK (mail_display_schedule_iframes_height_update_cb), display, 0);
-+
- 	webkit_user_content_manager_register_script_message_handler (manager, "mailDisplayHeadersCollapsed");
- 	webkit_user_content_manager_register_script_message_handler (manager, "mailDisplayMagicSpacebarStateChanged");
-+	webkit_user_content_manager_register_script_message_handler (manager, "scheduleIFramesHeightUpdate");
- 
- 	e_extensible_load_extensions (E_EXTENSIBLE (object));
- }
-diff -up evolution-3.40.4/src/modules/text-highlight/e-mail-formatter-text-highlight.c.6 evolution-3.40.4/src/modules/text-highlight/e-mail-formatter-text-highlight.c
---- evolution-3.40.4/src/modules/text-highlight/e-mail-formatter-text-highlight.c.6	2021-08-13 11:50:35.000000000 +0200
-+++ evolution-3.40.4/src/modules/text-highlight/e-mail-formatter-text-highlight.c	2023-01-03 18:41:01.215700736 +0100
-@@ -135,16 +135,26 @@ text_hightlight_read_data_thread (gpoint
- {
- 	TextHighlightClosure *closure = user_data;
- 	gint nbuffer = 10240;
-+	gssize read;
-+	gsize wrote = 0;
- 	gchar *buffer;
- 
- 	g_return_val_if_fail (closure != NULL, NULL);
- 
- 	buffer = g_new (gchar, nbuffer);
- 
-+	strcpy (buffer, "<style>body{margin:0; padding:8px;}</style>");
-+	read = strlen (buffer);
-+
-+	if (!g_output_stream_write_all (closure->output_stream, buffer, read, &wrote, closure->cancellable, &closure->error) ||
-+	    (gssize) wrote != read || closure->error) {
-+		g_free (buffer);
-+		return NULL;
-+	}
-+
- 	while (!camel_stream_eos (closure->read_stream) &&
- 	       !g_cancellable_set_error_if_cancelled (closure->cancellable, &closure->error)) {
--		gssize read;
--		gsize wrote = 0;
-+		wrote = 0;
- 
- 		read = camel_stream_read (closure->read_stream, buffer, nbuffer, closure->cancellable, &closure->error);
- 		if (read < 0 || closure->error)

SOURCES/evolution-3.40.4-new-button.patch

@@ -1,104 +0,0 @@
-diff -up evolution-3.40.4/src/shell/e-shell-window.c.7 evolution-3.40.4/src/shell/e-shell-window.c
---- evolution-3.40.4/src/shell/e-shell-window.c.7	2021-08-13 11:50:35.000000000 +0200
-+++ evolution-3.40.4/src/shell/e-shell-window.c	2022-09-26 09:33:45.615069941 +0200
-@@ -47,6 +47,7 @@ enum {
- enum {
- 	CLOSE_ALERT,
- 	SHELL_VIEW_CREATED,
-+	UPDATE_NEW_MENU,
- 	LAST_SIGNAL
- };
- 
-@@ -120,6 +121,17 @@ shell_window_toolbar_update_new_menu (Gt
- 	gtk_menu_tool_button_set_menu (menu_tool_button, menu);
- }
- 
-+static void
-+shell_window_toolbar_update_new_menu_sig (EShellWindow *shell_window,
-+                                          GtkMenuToolButton *menu_tool_button)
-+{
-+	GtkWidget *menu;
-+
-+	/* Update the "New" menu tool button submenu. */
-+	menu = e_shell_window_create_new_menu (shell_window);
-+	gtk_menu_tool_button_set_menu (menu_tool_button, menu);
-+}
-+
- static gboolean
- shell_window_active_view_to_prefer_item (GBinding *binding,
-                                          const GValue *source_value,
-@@ -160,6 +172,8 @@ shell_window_set_notebook_page (EShellWi
- 	g_return_if_fail (page_num >= 0);
- 
- 	gtk_notebook_set_current_page (notebook, page_num);
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- static void
-@@ -463,8 +477,8 @@ shell_window_construct_menubar (EShellWi
- 		main_menu, "visible",
- 		G_BINDING_SYNC_CREATE);
- 
--	e_signal_connect_notify (
--		shell_window, "notify::active-view",
-+	g_signal_connect (
-+		shell_window, "update-new-menu",
- 		G_CALLBACK (shell_window_menubar_update_new_menu), NULL);
- 
- 	return main_menu;
-@@ -544,6 +558,11 @@ shell_window_construct_toolbar (EShellWi
- 		G_CALLBACK (shell_window_toolbar_update_new_menu),
- 		shell_window);
- 
-+	g_signal_connect_object (
-+		shell_window, "update-new-menu",
-+		G_CALLBACK (shell_window_toolbar_update_new_menu_sig),
-+		item, 0);
-+
- 	gtk_box_pack_start (GTK_BOX (box), toolbar, TRUE, TRUE, 0);
- 
- 	toolbar = e_shell_window_get_managed_widget (
-@@ -1133,6 +1152,24 @@ e_shell_window_class_init (EShellWindowC
- 		G_TYPE_NONE, 1,
- 		E_TYPE_SHELL_VIEW);
- 
-+	/*
-+	 * EShellWindow::update-new-menu
-+	 * @shell_window: the #EShellWindow
-+	 *
-+	 * Emitted when the 'New' menu should be updated.
-+	 *
-+	 * Since: 3.44.5
-+	 */
-+	signals[UPDATE_NEW_MENU] = g_signal_new (
-+		"update-new-menu",
-+		G_OBJECT_CLASS_TYPE (object_class),
-+		G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
-+		0,
-+		NULL, NULL,
-+		g_cclosure_marshal_VOID__VOID,
-+		G_TYPE_NONE, 0,
-+		G_TYPE_NONE);
-+
- 	binding_set = gtk_binding_set_by_class (class);
- 	gtk_binding_entry_add_signal (
- 		binding_set, GDK_KEY_Escape, 0, "close-alert", 0);
-@@ -2048,6 +2085,8 @@ e_shell_window_register_new_item_actions
- 				G_OBJECT (action),
- 				"primary", GINT_TO_POINTER (TRUE));
- 	}
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- /**
-@@ -2125,6 +2164,8 @@ e_shell_window_register_new_source_actio
- 			G_OBJECT (action),
- 			"backend-name", (gpointer) backend_name);
- 	}
-+
-+	g_signal_emit (shell_window, signals[UPDATE_NEW_MENU], 0, NULL);
- }
- 
- /**

SOURCES/flatpak-evolution-wrapper.sh.in

@@ -5,7 +5,6 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
 else
    export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
    export GIO_USE_NETWORK_MONITOR=base
-   export WEBKIT_FORCE_SANDBOX=0
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)

SOURCES/webkitgtk-2.36.0-dark-theme.patch

@@ -1,51 +0,0 @@
-From ac15857f14eecd83a3a1950588a2f1edb9cb70de Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Fri, 18 Mar 2022 09:45:20 +0100
-Subject: [PATCH] I#1835 - Mail: Preview uses wrong colors for HTML mail with
- dark theme
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1835
----
- data/webkit/e-web-view.js                  | 12 ++++++++++--
- src/em-format/e-mail-formatter-text-html.c |  2 +-
- 2 files changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
-index 7f47fe4b26..a8f99c4668 100644
---- a/data/webkit/e-web-view.js
-+++ b/data/webkit/e-web-view.js
-@@ -695,8 +695,16 @@ Evo.initialize = function(elem)
- 
- 	if (doc.documentElement.style.getPropertyValue("color") == "" ||
- 	    doc.documentElement.style.getPropertyValue("color") == "text") {
--		doc.documentElement.style.setProperty("color", "inherit");
--		doc.documentElement.style.setProperty("background-color", "inherit");
-+		if (doc.defaultView && doc.defaultView.frameElement && !doc.defaultView.frameElement.hasAttribute("x-e-unset-colors") &&
-+		    doc.defaultView.frameElement.ownerDocument &&
-+		    doc.defaultView.frameElement.ownerDocument.defaultView &&
-+		    doc.defaultView.frameElement.ownerDocument.defaultView.window) {
-+			var style = doc.defaultView.frameElement.ownerDocument.defaultView.window.getComputedStyle(doc.defaultView.frameElement);
-+			if (style) {
-+				doc.documentElement.style.setProperty("color", style.color);
-+				doc.documentElement.style.setProperty("background-color", style.backgroundColor);
-+			}
-+		}
- 	}
- 
- 	elems = doc.querySelectorAll("input, textarea, select, button, label");
-diff --git a/src/em-format/e-mail-formatter-text-html.c b/src/em-format/e-mail-formatter-text-html.c
-index 708c29a5e4..8a938212ff 100644
---- a/src/em-format/e-mail-formatter-text-html.c
-+++ b/src/em-format/e-mail-formatter-text-html.c
-@@ -369,7 +369,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
- 			e_mail_part_get_id (part),
- 			e_mail_part_get_id (part),
- 			e_mail_part_get_frame_security_style (part),
--			g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #ffffff;\"");
-+			g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color:white; color:black;\"");
- 
- 		g_output_stream_write_all (
- 			stream, str, strlen (str),
--- 
-GitLab
-

SOURCES/webkitgtk-2.36.0-disable-hw-accel.patch

@@ -1,27 +0,0 @@
-From eb62ccaa28bbbca7668913ce7d8056a6d75f9b05 Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Thu, 21 Apr 2022 16:59:34 +0200
-Subject: [PATCH] Disable hardware acceleration for WebKitGTK
-
-This should help with crashes related to hardware acceleration
-on some machines, as being discussed at:
-https://bugs.webkit.org/show_bug.cgi?id=239429
----
- src/e-util/e-web-view.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/e-util/e-web-view.c b/src/e-util/e-web-view.c
-index 9ab13b69cc..68f86e8c59 100644
---- a/src/e-util/e-web-view.c
-+++ b/src/e-util/e-web-view.c
-@@ -3617,6 +3617,7 @@ e_web_view_get_default_webkit_settings (void)
- 		"enable-plugins", FALSE,
- 		"enable-smooth-scrolling", FALSE,
- 		"media-playback-allows-inline", FALSE,
-+		"hardware-acceleration-policy", WEBKIT_HARDWARE_ACCELERATION_POLICY_NEVER,
- 		NULL);
- 
- 	e_web_view_utils_apply_minimum_font_size (settings);
--- 
-GitLab
-

SOURCES/webkitgtk-2.46.1-middle-click-paste.patch

@@ -1,37 +0,0 @@
-diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
-index bc423841a8..d3217cd48b 100644
---- a/src/modules/webkit-editor/e-webkit-editor.c
-+++ b/src/modules/webkit-editor/e-webkit-editor.c
-@@ -5724,6 +5724,24 @@ webkit_editor_button_press_event (GtkWidget *widget,
- 	       GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_press_event (widget, event);
- }
- 
-+static gboolean
-+webkit_editor_button_release_event (GtkWidget *widget,
-+				    GdkEventButton *event)
-+{
-+	if (event->button == 2) {
-+		/* WebKitGTK 2.46.1 changed the middle-click paste behavior and moved
-+		   the paste handler from the button-press event into the button-release
-+		   event, which causes double paste of the clipboard content. As the paste
-+		   is handled in the webkit_editor_button_press_event() above, make sure
-+		   the release handler is not called here regardless whether the user
-+		   uses the changed WebkitGTK or not. */
-+		return TRUE;
-+	}
-+
-+	/* Chain up to parent's method. */
-+	return GTK_WIDGET_CLASS (e_webkit_editor_parent_class)->button_release_event (widget, event);
-+}
-+
- static gboolean
- webkit_editor_key_press_event (GtkWidget *widget,
-                                GdkEventKey *event)
-@@ -5814,6 +5832,7 @@ e_webkit_editor_class_init (EWebKitEditorClass *class)
- 
- 	widget_class = GTK_WIDGET_CLASS (class);
- 	widget_class->button_press_event = webkit_editor_button_press_event;
-+	widget_class->button_release_event = webkit_editor_button_release_event;
- 	widget_class->key_press_event = webkit_editor_key_press_event;
- 
- 	g_object_class_override_property (

SPECS/evolution.spec

@@ -11,15 +11,16 @@
 %global tnef_support 1
 %endif
 
-%define glib2_version 2.56
+%define glib2_version 2.66
 %define gtk3_version 3.22
 %define gnome_autoar_version 0.1.1
 %define gnome_desktop_version 2.91.3
 %define intltool_version 0.35.5
-%define libgdata_version 0.10.0
-%define libgweather_version 3.10
-%define libsoup_version 2.42
-%define webkit2gtk_version 2.28.0
+%define libgweather_version 3.91
+%define geocode_glib_version 3.26.3
+%define sqlite_version 3.7.17
+%define libsoup_version 3.1.1
+%define webkit2gtk_version 2.34.0
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
@@ -42,24 +43,20 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.40.4
-Release: 10%{?dist}.1
+Version: 3.54.2
+Release: 1%{?dist}.1
 Summary: Mail and calendar client for GNOME
-License: GPLv2+ and GFDL
-URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
+License: GPL-2.0-or-later AND GFDL-1.3-or-later
+URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
+Source: http://download.gnome.org/sources/%{name}/3.54/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
-Source3: emoji.data
 
-Patch01: evolution-3.40.4-empty-emoji-picker.patch
-Patch02: evolution-3.40.4-comp-editor-timezone-reset.patch
-Patch03: evolution-3.40.4-google-contacts-to-carddav.patch
-Patch04: webkitgtk-2.36.0-dark-theme.patch
-Patch05: webkitgtk-2.36.0-disable-hw-accel.patch
-Patch06: evolution-3.40.4-frame-flattenning.patch
-Patch07: evolution-3.40.4-new-button.patch
-Patch08: webkitgtk-2.46.1-middle-click-paste.patch
+# 0-99: General patches
+
+# 100-199: Flatpak-specific patches
+# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
+Patch100: configurable-dbus-prefix.patch
 
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
@@ -68,6 +65,7 @@ Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 Obsoletes: evolution-perl < %{last_evo_perl_version}
+Obsoletes: evolution-rss < 3.45.2
 
 %if !%{enable_installed_tests}
 Obsoletes: evolution-tests <= 3.31.1
@@ -82,7 +80,6 @@ Requires: %{_bindir}/killall
 Requires: gvfs
 %endif
 Requires: evolution-data-server >= %{eds_version}
-Requires: evolution-data-server-ui >= %{eds_version}
 Requires: gspell
 Requires: highlight
 Requires: %{name}-langpacks = %{version}-%{release}
@@ -110,7 +107,6 @@ BuildRequires: pkgconfig(cairo-gobject)
 BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(enchant-2)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gcr-3)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
@@ -120,22 +116,24 @@ BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gspell-1)
-BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+BuildRequires: pkgconfig(gweather4) >= %{libgweather_version}
+BuildRequires: pkgconfig(geocode-glib-2.0) >= %{geocode_glib_version}
 BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libcmark)
 BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
-BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(nspr)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(shared-mime-info)
-BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version}
+BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
+BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
+BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1) >= %{webkit2gtk_version}
 
 %if %{tnef_support}
 BuildRequires: pkgconfig(libytnef)
@@ -166,13 +164,12 @@ Requires: pkgconfig(camel-1.2) >= %{eds_version}
 Requires: pkgconfig(enchant-2)
 Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 Requires: pkgconfig(gspell-1)
-Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+Requires: pkgconfig(gweather4) >= %{libgweather_version}
 Requires: pkgconfig(libebackend-1.2) >= %{eds_version}
 Requires: pkgconfig(libebook-1.2) >= %{eds_version}
 Requires: pkgconfig(libecal-2.0) >= %{eds_version}
 Requires: pkgconfig(libedataserver-1.2) >= %{eds_version}
-Requires: pkgconfig(libgdata) >= %{libgdata_version}
-Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
 Requires: pkgconfig(libxml-2.0)
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
@@ -250,9 +247,15 @@ the functionality of the installed %{name} package.
 %endif
 
 %prep
-%autosetup -p1 -S gendiff
+%autosetup -p1 -S gendiff -N
+
+# General patches
+%autopatch -p1 -m 0 -M 99
 
-cp %{S:3} data/
+# Flatpak-specific patches
+%if 0%{?flatpak}
+%autopatch -p1 -m 100 -M 199
+%endif
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -298,13 +301,23 @@ fi
 %global tnef_flags -DENABLE_YTNEF=OFF
 %endif
 
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
+%if 0%{?flatpak}
+%global temp_home "-DTEMP_HOME=1"
+%else
+%global temp_home ""
+%endif
+
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home"
+export CFLAGS
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \
+	%if 0%{?flatpak}
+	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
+	%endif
 	%{nil}
 
 %cmake_build
@@ -397,7 +410,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_datadir}/icons/hicolor/24x24/apps/*
 %{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/symbolic/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
 
 # The main data directory
@@ -410,6 +422,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %dir %{_libdir}/evolution/modules
 %{_libdir}/evolution/modules/module-accounts-window.so
 %{_libdir}/evolution/modules/module-addressbook.so
+%{_libdir}/evolution/modules/module-appearance-settings.so
 %{_libdir}/evolution/modules/module-backup-restore.so
 %{_libdir}/evolution/modules/module-book-config-carddav.so
 %{_libdir}/evolution/modules/module-book-config-google.so
@@ -437,6 +450,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-prefer-plain.so
 %{_libdir}/evolution/modules/module-plugin-lib.so
 %{_libdir}/evolution/modules/module-plugin-manager.so
+%{_libdir}/evolution/modules/module-rss.so
 %{_libdir}/evolution/modules/module-settings.so
 %{_libdir}/evolution/modules/module-startup-wizard.so
 %{_libdir}/evolution/modules/module-text-highlight.so
@@ -448,6 +462,8 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-tnef-attachment.so
 %endif
 
+%{_libdir}/evolution-data-server/camel-providers/libcamelrss.so
+%{_libdir}/evolution-data-server/camel-providers/libcamelrss.urls
 %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
 
 # Shared libraries:
@@ -467,6 +483,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/libevolution-calendar-importers.so
 %{_libdir}/evolution/libevolution-mail-importers.so
 %{_libdir}/evolution/libevolution-mail.so
+%{_libdir}/evolution/libevolution-rss-common.so
 %{_libdir}/evolution/libevolution-smime.so
 %{_libdir}/evolution/libgnomecanvas.so
 
@@ -576,60 +593,194 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
-* Tue Oct 15 2024 Milan Crha <mcrha@redhat.com> - 3.40.4-10.1
-- Resolves: RHEL-62680 (WebKitGTK 2.46.1: Middle mouse button inserts primary clipboard twice)
+* Wed Dec 25 2024 Eduard Basov <ebasov@msvsphere-os.ru> - 3.54.2-1
+- Rebuilt for MSVSphere 10
 
-* Wed Oct 11 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-10
-- Related: RHEL-12405 (Move WebKitGTK parts in Evolution Data Server into optional subpackage)
-- Add dependency on newly introduced evolution-data-server-ui
+* Fri Nov 22 2024 Milan Crha <mcrha@redhat.com> - 3.54.2-1
+- Update to 3.54.2
 
-* Tue Jan 03 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-9
-- Resolves: #2126524 (Update patch to handle frame flattening change in WebKitGTK)
+* Fri Oct 18 2024 Milan Crha <mcrha@redhat.com> - 3.54.1-1
+- Update to 3.54.1
 
-* Mon Sep 26 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-8
-- Resolves: #2129703 (EShellWindow: The 'New' menu is not filled after start)
-- Correct Requires for the 'devel' subpackage to enchant-2
+* Fri Sep 13 2024 Milan Crha <mcrha@redhat.com> - 3.54.0-1
+- Update to 3.54.0
 
-* Wed Sep 14 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-7
-- Resolves: #2126524 (Add patch to handle frame flattening change in WebKitGTK)
+* Fri Aug 30 2024 Milan Crha <mcrha@redhat.com> - 3.53.3-1
+- Update to 3.53.3
 
-* Mon Apr 25 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-6
-- Resolves: #2078369 (Disable hardware acceleration for WebKitGTK)
+* Mon Aug 26 2024 David King <amigadave@amigadave.com> - 3.53.2-2
+- Rebuild against gspell
 
-* Fri Apr 08 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-5
-- Related: #2071056 (Update zh_CN and ja translations in the patch)
+* Fri Aug 02 2024 Milan Crha <mcrha@redhat.com> - 3.53.2-1
+- Update to 3.53.2
 
-* Tue Apr 05 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-4
-- Resolves: #2071056 (Addressbook: Switch from GData Contacts API to CardDAV API for Google books)
-- Resolves: #2071742 (Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x)
+* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.53.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
-* Mon Feb 14 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-3
-- Resolves: #2054084 (ECompEditor: Timezone can be reset on component save)
+* Fri Jun 28 2024 Milan Crha <mcrha@redhat.com> - 3.53.1-1
+- Update to 3.53.1
 
-* Mon Oct 11 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-2
-- Resolves: #2012701 (Empty emoji picker with gtk3 3.24.30)
+* Fri May 24 2024 Milan Crha <mcrha@redhat.com> - 3.52.2-1
+- Update to 3.52.2
 
-* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-1
-- Related: #1992450 (Update to 3.40.4)
+* Fri Apr 19 2024 Milan Crha <mcrha@redhat.com> - 3.52.1-1
+- Update to 3.52.1
 
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.3-2
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
+* Fri Mar 15 2024 Milan Crha <mcrha@redhat.com> - 3.52.0-1
+- Update to 3.52.0
 
-* Mon Jul 12 2021 Milan Crha <mcrha@redhat.com> - 3.40.3-1
-- Related: #1981215 (Update to 3.40.3)
+* Fri Mar 01 2024 Milan Crha <mcrha@redhat.com> - 3.51.3-1
+- Update to 3.51.3
 
-* Fri Jun 04 2021 Milan Crha <mcrha@redhat.com> - 3.40.2-1
-- Related: #1967855 (Update to 3.40.2)
+* Fri Mar 01 2024 Owen Taylor <otaylor@redhat.com> - 3.51.2-2
+- Add patch to fix backup tool for F39-style Flatpaks where the
+  EDS D-Bus service name prefix is set at container creation time.
 
-* Mon May 17 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-2
-- Resolves: #1961194 (Add missing bundled() Provides for libgnomecanvas)
+* Fri Feb 09 2024 Milan Crha <mcrha@redhat.com> - 3.51.2-1
+- Update to 3.51.2
 
-* Fri Apr 30 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-1
-- Related: #1952776 (Update to 3.40.1)
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.51.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.51.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 05 2024 Milan Crha <mcrha@redhat.com> - 3.51.1-1
+- Update to 3.51.1
+
+* Fri Dec 01 2023 Milan Crha <mcrha@redhat.com> - 3.50.2-1
+- Update to 3.50.2
+
+* Fri Oct 20 2023 Milan Crha <mcrha@redhat.com> - 3.50.1-1
+- Update to 3.50.1
+
+* Fri Sep 15 2023 Milan Crha <mcrha@redhat.com> - 3.50.0-1
+- Update to 3.50.0
+
+* Fri Sep 01 2023 Milan Crha <mcrha@redhat.com> - 3.49.3-1
+- Update to 3.49.3
+
+* Fri Aug 04 2023 Milan Crha <mcrha@redhat.com> - 3.49.2-1
+- Update to 3.49.2
+
+* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.49.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Fri Jun 30 2023 Milan Crha <mcrha@redhat.com> - 3.49.1-1
+- Update to 3.49.1
+
+* Fri Jun 02 2023 Milan Crha <mcrha@redhat.com> - 3.48.3-1
+- Update to 3.48.3
+
+* Tue May 30 2023 Milan Crha <mcrha@redhat.com> - 3.48.2-3
+- Add patch to workaround recursion in iframe height computation in mail preview
+
+* Mon May 29 2023 Milan Crha <mcrha@redhat.com> - 3.48.2-2
+- Add upstream fix for a regression on mail preview panel sometimes growing indefinitely
+
+* Fri May 26 2023 Milan Crha <mcrha@redhat.com> - 3.48.2-1
+- Update to 3.48.2
+
+* Fri Apr 21 2023 Milan Crha <mcrha@redhat.com> - 3.48.1-1
+- Update to 3.48.1
+
+* Fri Mar 17 2023 Milan Crha <mcrha@redhat.com> - 3.48.0-1
+- Update to 3.48.0
+
+* Fri Mar 03 2023 Milan Crha <mcrha@redhat.com> - 3.47.3-1
+- Update to 3.47.3
+- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak)
+
+* Fri Feb 10 2023 Milan Crha <mcrha@redhat.com> - 3.47.2-1
+- Update to 3.47.2
+
+* Mon Jan 30 2023 Jens Petersen <petersen@redhat.com> - 3.47.1-4
+- rebuild
+
+* Fri Jan 27 2023 Jens Petersen <petersen@redhat.com> - 3.47.1-3
+- rebuild f38 against newer cmark
 
-* Thu Apr 15 2021 Mohan Boddu <mboddu@redhat.com> - 3.40.0-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.47.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
+* Fri Jan 06 2023 Milan Crha <mcrha@redhat.com> - 3.47.1-1
+- Update to 3.47.1
+
+* Fri Dec 02 2022 Milan Crha <mcrha@redhat.com> - 3.46.2-1
+- Update to 3.46.2
+
+* Fri Oct 21 2022 Milan Crha <mcrha@redhat.com> - 3.46.1-1
+- Update to 3.46.1
+
+* Fri Sep 23 2022 Milan Crha <mcrha@redhat.com> - 3.46.0-2
+- Resolves: #2129068 (Busy loop when opening composer window)
+
+* Fri Sep 16 2022 Milan Crha <mcrha@redhat.com> - 3.46.0-1
+- Update to 3.46.0
+
+* Fri Sep 02 2022 Milan Crha <mcrha@redhat.com> - 3.45.3-1
+- Update to 3.45.3
+- Obsolete evolution-rss
+
+* Fri Aug 05 2022 Milan Crha <mcrha@redhat.com> - 3.45.2-1
+- Update to 3.45.2
+
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.45.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
+* Tue Jul 19 2022 Milan Crha <mcrha@redhat.com> - 3.45.1-1
+- Update to 3.45.1
+
+* Fri Jul 01 2022 Milan Crha <mcrha@redhat.com> - 3.44.3-1
+- Update to 3.44.3
+
+* Fri May 27 2022 Milan Crha <mcrha@redhat.com> - 3.44.2-1
+- Update to 3.44.2
+
+* Fri Apr 22 2022 Milan Crha <mcrha@redhat.com> - 3.44.1-1
+- Update to 3.44.1
+
+* Fri Mar 18 2022 Milan Crha <mcrha@redhat.com> - 3.44.0-1
+- Update to 3.44.0
+
+* Fri Mar 04 2022 Milan Crha <mcrha@redhat.com> - 3.43.3-1
+- Update to 3.43.3
+
+* Fri Feb 11 2022 Milan Crha <mcrha@redhat.com> - 3.43.2-1
+- Update to 3.43.2
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 3.43.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Fri Jan 07 2022 Milan Crha <mcrha@redhat.com> - 3.43.1-1
+- Update to 3.43.1
+
+* Fri Dec 03 2021 Milan Crha <mcrha@redhat.com> - 3.42.2-1
+- Update to 3.42.2
+
+* Fri Oct 29 2021 Milan Crha <mcrha@redhat.com> - 3.42.1-1
+- Update to 3.42.1
+
+* Fri Sep 17 2021 Milan Crha <mcrha@redhat.com> - 3.42.0-1
+- Update to 3.42.0
+
+* Fri Sep 03 2021 Milan Crha <mcrha@redhat.com> - 3.41.3-1
+- Update to 3.41.3
+
+* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.41.2-1
+- Update to 3.41.2
+
+* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.41.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Fri Jul 09 2021 Milan Crha <mcrha@redhat.com> - 3.41.1-1
+- Update to 3.41.1
+
+* Fri Jun 04 2021 Milan Crha <mcrha@redhat.com> - 3.40.2-1
+- Update to 3.40.2
+
+* Fri Apr 30 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-1
+- Update to 3.40.1
 
 * Fri Mar 19 2021 Milan Crha <mcrha@redhat.com> - 3.40.0-1
 - Update to 3.40.0
@@ -955,7 +1106,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Mon Sep 12 2016 Milan Crha <mcrha@redhat.com> - 3.21.92-1
 - Update to 3.21.92
-- Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream)
+- Remove patch for "Adapt to WebKit Unstable DOM API changes" (fixed upstream)
 
 * Thu Sep 01 2016 Tomas Popela <tpopela@redhat.com> - 3.21.91-2
 - Adapt to WebKit Unstable DOM API changes
@@ -2544,23 +2695,23 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Wed Jan 25 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.5.1-1
 - 2.5.5.1
-- update patch 106 to track upstream, renaming from 
-  evolution-2.2.2-commit-enter-on-calendar.patch to 
+- update patch 106 to track upstream, renaming from
+  evolution-2.2.2-commit-enter-on-calendar.patch to
   evolution-2.5.5.1-commit-enter-on-calendar.patch
 - update patch 805 to track upstream
 - added patch to fix some newly missing declarations (patch 808)
-- replace evolution-2.5.4-port-to-new-libnotify-api.patch with 
-  evolution-2.5.5.1-notification-cleanups.patch, since much of this was 
-  duplicated by another patch that landed upstream; removing the actions code 
+- replace evolution-2.5.4-port-to-new-libnotify-api.patch with
+  evolution-2.5.5.1-notification-cleanups.patch, since much of this was
+  duplicated by another patch that landed upstream; removing the actions code
   as it was crashing deep inside DBus (patch 806, #177666)
 - explicitly list various files to reduce reliance on globbing; organized the
   files into logical groups; comment them
 - added -Wno-sign-compare to CFLAGS
 - enabled parallel make
-- introduced require_function_declarations macro to make 
+- introduced require_function_declarations macro to make
   -Werror-implicit-function-declaration flag optional; turn it off for now
 - include the new CalDAV and mail-attachments-import plugins in the file list;
-  add an XML UI file for the mail-to-task plugin. 
+  add an XML UI file for the mail-to-task plugin.
 - use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files
 
 * Wed Jan 18 2006 Ray Strode <rstrode@redhat.com> - 2.5.4-10
@@ -2570,11 +2721,11 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - fix multilib issue with shlib bonobo components (bug 156982)
 
 * Thu Jan 12 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-8
-- avoid multiple initialization of NetworkManager connections (patch 807, 
+- avoid multiple initialization of NetworkManager connections (patch 807,
   gnome bug #326785)
 
 * Thu Jan 12 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-7
-- updated alarm notification patch(patch 806, #177546, #177666, #177667, 
+- updated alarm notification patch(patch 806, #177546, #177666, #177667,
   #177670)
 
 * Thu Jan 12 2006 Christopher Aillon <caillon@redhat.com> - 2.5.4-6
@@ -2590,9 +2741,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Jan 10 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-3
 - updated patch 800 to include patch for memo conduit (untested at this stage);
-  renaming from evolution-2.5.2-fix-conduits.patch to 
-  evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo 
-  conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to 
+  renaming from evolution-2.5.2-fix-conduits.patch to
+  evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo
+  conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to
   evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160)
 - switch the build-time dep for the audio-inline plugin from gstreamer-devel to
   gstreamer08-devel to better reflect the test in the tarball's configure.in
@@ -2628,20 +2779,20 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - bump evo_major from 2.4 to 2.6
 - updated patch 107
 - updated patch 108
-- updated patch 800, replacing 
-  rh-161817-attach-116019-conduit_pilot_link_updates.diff with 
+- updated patch 800, replacing
+  rh-161817-attach-116019-conduit_pilot_link_updates.diff with
   evolution-2.5.2-fix-conduits.patch.  Not yet complete.
 - disable pilot support for now (see #175160)
 - added hula plugin to list of packaged plugins
 - generalize gconf schema packaging to support changing evo_major
 
 * Fri Dec  2 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.2-2
-- force regeneration of the intltool files to prevent a problem where the 
+- force regeneration of the intltool files to prevent a problem where the
   tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
-  latest shipped copy of intltool, which resulted in a broken intltool-merge 
-  script when the tree was reautotooled.  (appears that the tarball was built 
+  latest shipped copy of intltool, which resulted in a broken intltool-merge
+  script when the tree was reautotooled.  (appears that the tarball was built
   with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
-  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that 
+  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that
   change)
 
 * Tue Nov 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.2-1
@@ -2680,7 +2831,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Oct  4 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-1
 - 2.4.1
-- regenerate patch 101 to handle conflict in 
+- regenerate patch 101 to handle conflict in
   calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug
   244981 (end date added while printing in the week view); bump patch name from
   version 5 to version 6
@@ -2691,7 +2842,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Wed Sep  7 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.0-1
 - 2.4.0
-- Removed patch to fix implicit function declarations (patch 110, added in 
+- Removed patch to fix implicit function declarations (patch 110, added in
   2.3.8-1) as this is now upstream.
 
 * Thu Sep  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-4
@@ -2707,7 +2858,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Aug 23 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-1
 - 2.3.8
-- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the 
+- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the
   problems arising (patch 110)
 
 * Tue Aug 16 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-3
@@ -2727,14 +2878,14 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - rebuild with new gnutls
 
 * Tue Aug  2 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-4
-- Added patch to show correct mimetype for OpenOffice.org files when guessing 
+- Added patch to show correct mimetype for OpenOffice.org files when guessing
   type for attachments with mimetype "application/octet-stream" (#164957)
 
 * Mon Aug  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-3
 - Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)
 
 * Sat Jul 30 2005 David Malcolm <dmalcolm@redhat.com> 2.3.6.1-2
-- Fixed version numbers in GConf schema files (#164622); added 
+- Fixed version numbers in GConf schema files (#164622); added
   apps-evolution-mail-prompts-checkdefault-2.4.schemas
 
 * Fri Jul 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-1
@@ -2742,9 +2893,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Thu Jul 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6-1
 - 2.3.6
-- Bump evolution-data-server requirement to 1.3.6 (needed for 
+- Bump evolution-data-server requirement to 1.3.6 (needed for
   CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
-- Removed libgal2[-devel] dependencies; the code has been moved into the 
+- Removed libgal2[-devel] dependencies; the code has been moved into the
   evolution tarball
 
 * Thu Jul 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-2
@@ -2787,13 +2938,13 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - added evolution-2.2.2-fix-new-mail-notify.patch to CVS
 
 * Thu May  5 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-4
-- Removed explicit mozilla_build_version; instead use pkg-config to determine 
+- Removed explicit mozilla_build_version; instead use pkg-config to determine
 the path to the NSS/NSPR headers.
-- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12; 
+- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
 patches depend on this)
-- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus 
-versions is in the upstream tarball; but configure.in disables the plugin for 
-dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions, 
+- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
+versions is in the upstream tarball; but configure.in disables the plugin for
+dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions,
 and run autoconf at the start of the build) (#156328)
 
 * Sat Apr 30 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-3
@@ -2851,7 +3002,7 @@ and run autoconf at the start of the build) (#156328)
   The libraries are always located in the libdir
   However, the headers are in /usr/include/mozilla-%%{mozilla_build_version}
   and so they move each time the mozilla version changes.
-  So we no longer have an explicit mozilla run-time requirement in the specfile; 
+  So we no longer have an explicit mozilla run-time requirement in the specfile;
   a requirement on the appropriate NSS and NSPR .so files is automagically generated on build.
   We have an explicit, exact build-time version, so that we can find the headers (without
   invoking an RPM query from the spec file; to do so is considered bad practice)
@@ -2925,7 +3076,7 @@ and run autoconf at the start of the build) (#156328)
    XB69079 - Data repeated after save with bad date format (Siva)
    XB66854 - Some strings are missed to translation (Rodney)
 
- * Calendar 	
+ * Calendar
    XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney)
    XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP)
    XB67403 - wrong alarm time displayed (Rodrigo)
@@ -2939,9 +3090,9 @@ and run autoconf at the start of the build) (#156328)
    XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael)
    XB69615 - delete certificate after viewing smime message (Michael)
    XB69109 - EHLO or HELO with ip addresses does not conform rfc 821  (Michael)
-   XB69982 - During Newsgroup list refresh, it crashes (Michael) 
-   XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur) 
-   XB68556 - NNTP with SSL won't work, even with stunnel (Michael) 
+   XB69982 - During Newsgroup list refresh, it crashes (Michael)
+   XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur)
+   XB68556 - NNTP with SSL won't work, even with stunnel (Michael)
    XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael)
    XB69241 - base64 attachement holding PGP block (Jeff)
    XB67895 - nntp support not asking for password (Michael)
@@ -3098,7 +3249,7 @@ and run autoconf at the start of the build) (#156328)
 * Wed Feb 18 2004 Jeremy Katz <katzj@redhat.com> - 1.5.4-1
 - 1.5.4
 
-* Tue Feb 17 2004 Jeremy Katz <katzj@redhat.com> 
+* Tue Feb 17 2004 Jeremy Katz <katzj@redhat.com>
 - buildrequire e-d-s-devel instead of e-d-s (#114712)
 - enable nntp support (#114802)
 
@@ -3128,13 +3279,13 @@ and run autoconf at the start of the build) (#156328)
 - fix title on composer save dialog (#108159)
 
 * Mon Oct 27 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-6
-- Make imap command length shorter to avoid choking some imap servers 
+- Make imap command length shorter to avoid choking some imap servers
   (notably cyrus-imap).
 - Make wombat session managed so that we don't hit weird bonobo activation
   things.  This adds a dependency on $DISPLAY for wombat.  (#106826)
 
 * Sun Oct 19 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-5
-- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without 
+- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without
   IPv6 support
 - add patch from upstream with reply-to-list shortcut (Ctrl-l)
 
@@ -3149,37 +3300,37 @@ and run autoconf at the start of the build) (#156328)
   * Use proper function for IPV6 reverse lookups (X#46006)
   * Allow timezone offset to be up to 14 hours (X#49357)
 
-* Mon Oct 13 2003 Jeremy Katz <katzj@redhat.com> 
-- add patch from upstream CVS to fix SMTP syntax problems (#106630) 
+* Mon Oct 13 2003 Jeremy Katz <katzj@redhat.com>
+- add patch from upstream CVS to fix SMTP syntax problems (#106630)
 - really remove duplicate menu entry (#103826)
 
-* Mon Oct  6 2003 Jeremy Katz <katzj@redhat.com> 
+* Mon Oct  6 2003 Jeremy Katz <katzj@redhat.com>
 - make redhat-email.desktop symlink relative (#104391)
 
-* Wed Sep 24 2003 Jeremy Katz <katzj@redhat.com> 
+* Wed Sep 24 2003 Jeremy Katz <katzj@redhat.com>
 - add ipv6 support per dwmw2's request
 
 * Tue Sep 23 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-2
 - 1.4.5
 
-* Wed Sep 17 2003 Jeremy Katz <katzj@redhat.com> 
+* Wed Sep 17 2003 Jeremy Katz <katzj@redhat.com>
 - move static libs into -devel (#104399)
 
 * Tue Sep 16 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-7
 - filter types are gtypes, not ints (#103934)
 
 * Wed Sep 10 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-6
-- fix from upstream (will be in 1.4.5) to fix menu merging in the 
+- fix from upstream (will be in 1.4.5) to fix menu merging in the
   composer with new libbonobo
 
-* Fri Sep  5 2003 Jeremy Katz <katzj@redhat.com> 
+* Fri Sep  5 2003 Jeremy Katz <katzj@redhat.com>
 - remove the desktop file in Office (#103826)
 
 * Tue Sep  2 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-5
-- patch from upstream to fix display of some mails in 
+- patch from upstream to fix display of some mails in
   different charsets (#102899)
 - add requires on newer version of ORBit2 (#103386)
-- add patch from upstream (extracted by George Karabin) to use gnome-vfs 
+- add patch from upstream (extracted by George Karabin) to use gnome-vfs
   mime icon lookup where available (#102553)
 
 * Fri Aug 22 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-4
@@ -3191,7 +3342,7 @@ and run autoconf at the start of the build) (#156328)
 * Mon Aug  4 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-1
 - 1.4.4
 
-* Wed Jul 30 2003 Jeremy Katz <katzj@redhat.com> 
+* Wed Jul 30 2003 Jeremy Katz <katzj@redhat.com>
 - buildrequires fixup from Ville Skytta (#101325)
 
 * Thu Jul 24 2003 Jeremy Katz <katzj@redhat.com> 1.4.3-6
@@ -3209,10 +3360,10 @@ and run autoconf at the start of the build) (#156328)
 * Thu Jul 10 2003 Jeremy Katz <katzj@redhat.com> 1.4.3-1
 - 1.4.3
 
-* Thu Jun 19 2003 Jeremy Katz <katzj@redhat.com> 
+* Thu Jun 19 2003 Jeremy Katz <katzj@redhat.com>
 - make gal version dep more explicit
 
-* Fri Jun 13 2003 Jeremy Katz <katzj@redhat.com> 
+* Fri Jun 13 2003 Jeremy Katz <katzj@redhat.com>
 - fix desktop file (#97162)
 
 * Tue Jun 10 2003 Jeremy Katz <katzj@redhat.com> 1.4.0-2
@@ -3228,7 +3379,7 @@ and run autoconf at the start of the build) (#156328)
 * Thu Jun  5 2003 Jeremy Katz <katzj@redhat.com> 1.3.92-2
 - rebuild
 
-* Wed Jun  4 2003 Jeremy Katz <katzj@redhat.com> 
+* Wed Jun  4 2003 Jeremy Katz <katzj@redhat.com>
 - buildrequires gettext (#92276)
 
 * Sun May 25 2003 Jeremy Katz <katzj@redhat.com> 1.3.92-1
@@ -3247,13 +3398,13 @@ and run autoconf at the start of the build) (#156328)
 * Tue Apr 22 2003 Jeremy Katz <katzj@redhat.com>
 - add a /usr/bin/evolution symlink
 
-* Mon Apr 21 2003 Jeremy Katz <katzj@redhat.com> 
+* Mon Apr 21 2003 Jeremy Katz <katzj@redhat.com>
 - fix gnome-spell version requirement
 
 * Wed Apr 16 2003 Jeremy Katz <katzj@redhat.com> 1.3.2-1
 - add trivial fix for evolution-mail schema key (ximian #41419)
 
-* Tue Apr 15 2003 Jeremy Katz <katzj@redhat.com> 
+* Tue Apr 15 2003 Jeremy Katz <katzj@redhat.com>
 - update to 1.3
 - don't build with pilot support for now
 - don't redhat-ify the summary prefs for now
@@ -3270,7 +3421,7 @@ and run autoconf at the start of the build) (#156328)
 * Thu Apr  3 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-6
 - add a few cleanups for 64bit cleanliness (#86347)
 
-* Sun Mar 30 2003 Jeremy Katz <katzj@redhat.com> 
+* Sun Mar 30 2003 Jeremy Katz <katzj@redhat.com>
 - add some buildrequires (#87612)
 
 * Mon Mar 24 2003 Jeremy Katz <katzj@redhat.com> 1.2.3-1
@@ -3280,14 +3431,14 @@ and run autoconf at the start of the build) (#156328)
 - security patches from upstream
   - sanity check UUEncoding header before decoding (CAN-2003-0128)
   - don't decode doubly UUEncoded content (CAN-2003-0129)
-  - don't use a bonobo component to display things without registered 
+  - don't use a bonobo component to display things without registered
     handlers (CAN-2003-0130)
 
 * Mon Feb 24 2003 Elliot Lee <sopwith@redhat.com> 1.2.2-4
 - debuginfo rebuild
 
 * Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-3
-- memleak patch had some bits that weren't supposed to be there.  update 
+- memleak patch had some bits that weren't supposed to be there.  update
   to newer from upstream.
 - fix directory checking in proxy patch
 
@@ -3298,7 +3449,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Fri Feb  7 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-1
 - 1.2.2
-- build on x86_64 
+- build on x86_64
 
 * Wed Jan 22 2003 Tim Powers <timp@redhat.com>
 - rebuilt
@@ -3320,7 +3471,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Thu Dec 12 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-6
 - require a newer soup, the old one Has Bugs (tm)
-- excludearch x86_64; getting a R_X86_64_32S relocation in libical 
+- excludearch x86_64; getting a R_X86_64_32S relocation in libical
   although everything appears to be built with -fPIC correctly
 
 * Tue Dec 10 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-5
@@ -3330,7 +3481,7 @@ and run autoconf at the start of the build) (#156328)
 - add upstream patch to handle LDAPv3 better
 - add upstream patch to fix shell memory leaks
 - add upstream patch to fix ldap scope selection
-- build with openssl instead of mozilla-nss since it's available on 
+- build with openssl instead of mozilla-nss since it's available on
   more platforms
 - build on all arches
 
@@ -3341,7 +3492,7 @@ and run autoconf at the start of the build) (#156328)
 - disable pilot support for mainframe
 
 * Mon Nov 18 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-2
-- macro-ify the mozilla version to make it easier to build against 
+- macro-ify the mozilla version to make it easier to build against
   newer mozillas with headers in new locations
 - buildrequire pilot-link-devel (#78077)
 - drop uneeded ldapv3 patch (toshok says 1.2 already handles this)
@@ -3394,18 +3545,18 @@ and run autoconf at the start of the build) (#156328)
 
 * Tue Jul  9 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-3
 - remove static and libtool archives for importers and camel-providers (#68222)
-- do desktop-file-install magic 
+- do desktop-file-install magic
 - remove dead sites from summary list (#64522)
-- support openldap protocol version 3 based off of Nalin's autofs changes 
+- support openldap protocol version 3 based off of Nalin's autofs changes
 
 * Mon Jul  8 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-2
 - fix openldap-devel buildrequire
 
 * Mon Jul  1 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-1
-- 1.0.8 
+- 1.0.8
 
 * Thu Jun 27 2002 Jeremy Katz <katzj@redhat.com> 1.0.7-2
-- include patch to omf files from otaylor@redhat.com to fix 
+- include patch to omf files from otaylor@redhat.com to fix
   scrollkeeper validation errors
 
 * Sun Jun 23 2002 Jeremy Katz <katzj@redhat.com> 1.0.7-1
@@ -3420,19 +3571,19 @@ and run autoconf at the start of the build) (#156328)
 
 * Fri May  3 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-6
 - add patch to fix spool unread counts (#64198)
-- build with the fix for the crasher mail sent to 
+- build with the fix for the crasher mail sent to
   evolution-list (ximian #24140)
 
 * Mon Apr 15 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-4
-- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl 
+- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl
   since it's been committed to the branch and fixes the problem for me
-- include patch from tagoh(at)redhat.com to change the default charset 
+- include patch from tagoh(at)redhat.com to change the default charset
   for Japanese to ISO-2022-JP (#63214)
 
 * Wed Apr 10 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-3
 - minor tweaks to the redhatify patch
 - make accepting appointments sent to mailing lists work
-- use the RFC specified LDAP attribs for freebusy and calendarURI 
+- use the RFC specified LDAP attribs for freebusy and calendarURI
   in addressbook
 - fix a crash in the startup wizard
 
@@ -3447,7 +3598,7 @@ and run autoconf at the start of the build) (#156328)
 - put correct path to nspr includes on configure command line
 
 * Mon Mar 11 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-3
-- mozilla 0.9.9 has nspr and nss subpackages, hooray!  rip out the static 
+- mozilla 0.9.9 has nspr and nss subpackages, hooray!  rip out the static
   libnss linkage and just link against what is provided dynamically
 - kill the -devel subpackage since it's of questionable use
 - explicitly require mozilla-nss and mozilla-nspr packages to make it easier
@@ -3468,7 +3619,7 @@ and run autoconf at the start of the build) (#156328)
 - add pilot support
 
 * Sun Jan 13 2002 Jeremy Katz <katzj@redhat.com> 1.0.1-2
-- rebuild without mozilla-psm in the buildroot so libnss is linked 
+- rebuild without mozilla-psm in the buildroot so libnss is linked
   statically as intended
 
 * Sat Jan 12 2002 Jeremy Katz <katzj@redhat.com> 1.0.1-1
@@ -3479,7 +3630,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Tue Dec 18 2001 Jeremy Katz <katzj@redhat.com> 1.0-2
 - really disable news
-- add patch from Jens Petersen <juhp@redhat.com> to hopefully get 
+- add patch from Jens Petersen <juhp@redhat.com> to hopefully get
   builds working with autoconf 2.52
 - conditionalize static libnss stuff so that it can go away when we
   have a mozilla with shared libnss
@@ -3506,8 +3657,8 @@ and run autoconf at the start of the build) (#156328)
 
 * Sat Nov 17 2001 Jeremy Katz <katzj@redhat.com>
 - we can build on ia64 since we're using openssl instead of nspr
-- disable non-functional nntp support 
-- 0.99.2 (rc2) 
+- disable non-functional nntp support
+- 0.99.2 (rc2)
 
 * Fri Nov  9 2001 Jeremy Katz <katzj@redhat.com>
 - add explicit requires on current bonobo, oaf, and GConf to help people
@@ -3515,7 +3666,7 @@ and run autoconf at the start of the build) (#156328)
 - s/Copyright/License/
 
 * Thu Nov  8 2001 Jeremy Katz <katzj@redhat.com>
-- add a patch to revert changes to camel-tcp-stream-openssl; appears to 
+- add a patch to revert changes to camel-tcp-stream-openssl; appears to
   fix the SSL hangs
 
 * Wed Nov  7 2001 Jeremy Katz <katzj@redhat.com>
@@ -3549,4 +3700,3 @@ and run autoconf at the start of the build) (#156328)
 
 * Mon Aug 06 2001 David Sainty <dsainty@redhat.com>
 - First spec file for evolution.
-