automatic import of evolutionopeneuler24.03_LTS

12 files changed, 5485 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
index e69de29..24f6855 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1,2 @@
+/emoji.data
+/evolution-3.40.4.tar.xz
diff --git a/evolution-3.40.4-comp-editor-timezone-reset.patch b/evolution-3.40.4-comp-editor-timezone-reset.patch
new file mode 100644
index 0000000..9cf99f6
--- /dev/null
+++ b/evolution-3.40.4-comp-editor-timezone-reset.patch
@@ -0,0 +1,68 @@
+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
+
diff --git a/evolution-3.40.4-empty-emoji-picker.patch b/evolution-3.40.4-empty-emoji-picker.patch
new file mode 100644
index 0000000..7301d41
--- /dev/null
+++ b/evolution-3.40.4-empty-emoji-picker.patch
@@ -0,0 +1,56 @@
+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));
+     }
+ 
diff --git a/evolution-3.40.4-frame-flattenning.patch b/evolution-3.40.4-frame-flattenning.patch
new file mode 100644
index 0000000..8ae3210
--- /dev/null
+++ b/evolution-3.40.4-frame-flattenning.patch
@@ -0,0 +1,468 @@
+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)
diff --git a/evolution-3.40.4-google-contacts-to-carddav.patch b/evolution-3.40.4-google-contacts-to-carddav.patch
new file mode 100644
index 0000000..3bbe829
--- /dev/null
+++ b/evolution-3.40.4-google-contacts-to-carddav.patch
@@ -0,0 +1,1124 @@
+diff -up evolution-3.40.4/.3 evolution-3.40.4/
+diff -up evolution-3.40.4/po/ca.po.3 evolution-3.40.4/po/ca.po
+--- evolution-3.40.4/po/ca.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/ca.po	2022-04-05 10:00:37.396025268 +0200
+@@ -29878,3 +29878,11 @@ msgstr "Certificat importat"
+ 
+ #~ msgid "Certificate details"
+ #~ msgstr "Detalls del certificat"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Llibreta d'adreces d'usuari per defecte"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Llibreta d'adreces:"
+diff -up evolution-3.40.4/po/cs.po.3 evolution-3.40.4/po/cs.po
+--- evolution-3.40.4/po/cs.po.3	2022-04-05 10:00:37.398025267 +0200
++++ evolution-3.40.4/po/cs.po	2022-04-05 10:01:37.100998171 +0200
+@@ -28264,3 +28264,10 @@ msgstr "Nelze zapsat úložiště na dis
+ msgid "Imported Certificate"
+ msgstr "Importovaný certifikát"
+ 
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Výchozí uživatelský adresář"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresář:"
+diff -up evolution-3.40.4/po/da.po.3 evolution-3.40.4/po/da.po
+--- evolution-3.40.4/po/da.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/da.po	2022-04-05 10:00:37.400025266 +0200
+@@ -28202,3 +28202,11 @@ msgstr "Kan ikke skrive lageret til disk
+ #: ../src/smime/lib/e-pkcs12.c:407
+ msgid "Imported Certificate"
+ msgstr "Importeret certifikat"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Standard-brugeradressebog"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adressebog:"
+diff -up evolution-3.40.4/po/de.po.3 evolution-3.40.4/po/de.po
+--- evolution-3.40.4/po/de.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/de.po	2022-04-05 10:00:37.402025265 +0200
+@@ -28546,3 +28546,11 @@ msgstr "Importiertes Zertifikat"
+ 
+ #~ msgid "%d/%m/%Y"
+ #~ msgstr "%d.%m.%Y"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Standard-Benutzer-Adressbuch"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adressbuch:"
+diff -up evolution-3.40.4/po/el.po.3 evolution-3.40.4/po/el.po
+--- evolution-3.40.4/po/el.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/el.po	2022-04-05 10:00:37.404025264 +0200
+@@ -36518,3 +36518,11 @@ msgstr "Εισηγμένο πιστοπ�
+ #~ msgstr ""
+ #~ "Ειδοποιεί τον χρήστη με ένα εικονίδιο στην περιοχή ειδοποίησης και με ένα "
+ #~ "μήνυμα ειδοποίησης κάθε φορά που φθάνει ένα νέο μήνυμα."
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Προεπιλεγμένο βιβλίο διευθύνσεων χρήστη"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Βιβλίο διευθύνσεων:"
+diff -up evolution-3.40.4/po/eo.po.3 evolution-3.40.4/po/eo.po
+--- evolution-3.40.4/po/eo.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/eo.po	2022-04-05 10:00:37.406025263 +0200
+@@ -27968,3 +27968,7 @@ msgstr "Enportita atestilo"
+ 
+ #~ msgid "Read and write emails"
+ #~ msgstr "Legi kaj skribi retpoŝtojn"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresaro:"
+diff -up evolution-3.40.4/po/es.po.3 evolution-3.40.4/po/es.po
+--- evolution-3.40.4/po/es.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/es.po	2022-04-05 10:00:37.408025262 +0200
+@@ -29113,3 +29113,11 @@ msgstr "Certificado importado"
+ #~ msgstr ""
+ #~ "El calendario «%s» contiene %d citas que entran en conflicto con esta "
+ #~ "reunión"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Eliminar la libreta de direcciones de usuario predeterminada"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Libreta de direcciones:"
+diff -up evolution-3.40.4/po/eu.po.3 evolution-3.40.4/po/eu.po
+--- evolution-3.40.4/po/eu.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/eu.po	2022-04-05 10:00:37.409025262 +0200
+@@ -27204,3 +27204,11 @@ msgstr "Inportatutako ziurtagiria"
+ 
+ #~ msgid "_Destination"
+ #~ msgstr "_Helburua"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Erabiltzailearen helbide-liburu lehenetsia"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Helbide-liburua:"
+diff -up evolution-3.40.4/po/fi.po.3 evolution-3.40.4/po/fi.po
+--- evolution-3.40.4/po/fi.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/fi.po	2022-04-05 10:00:37.411025261 +0200
+@@ -29750,3 +29750,7 @@ msgstr "Tuotu varmenne"
+ 
+ #~ msgid "Certificate details"
+ #~ msgstr "Varmenteen yksityiskohdat"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Osoitekirja:"
+diff -up evolution-3.40.4/po/fr.po.3 evolution-3.40.4/po/fr.po
+--- evolution-3.40.4/po/fr.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/fr.po	2022-04-05 10:00:37.413025260 +0200
+@@ -28750,3 +28750,11 @@ msgstr "Certificat importé"
+ 
+ #~ msgid "Preserve exiting reminder by default"
+ #~ msgstr "Conserver les rappels existants par défaut"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Carnet d’adresses par défaut de l’utilisateur"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Carnet d’adresses :"
+diff -up evolution-3.40.4/po/fur.po.3 evolution-3.40.4/po/fur.po
+--- evolution-3.40.4/po/fur.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/fur.po	2022-04-05 10:00:37.414025260 +0200
+@@ -29053,3 +29053,11 @@ msgstr "Certificât impuartât"
+ #~ msgctxt "PGPKeyDescription"
+ #~ msgid "%s - %s"
+ #~ msgstr "%s - %s"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Rubriche utent predefinît"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Rubriche:"
+diff -up evolution-3.40.4/po/gl.po.3 evolution-3.40.4/po/gl.po
+--- evolution-3.40.4/po/gl.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/gl.po	2022-04-05 10:00:37.416025259 +0200
+@@ -28502,3 +28502,11 @@ msgstr "Certificado importado"
+ 
+ #~ msgid "Delivery Notification for “%s”"
+ #~ msgstr "Notificación de recepción para «%s»"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Axenda de enderezos predeterminada do usuario"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Caderno de enderezos:"
+diff -up evolution-3.40.4/po/hr.po.3 evolution-3.40.4/po/hr.po
+--- evolution-3.40.4/po/hr.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/hr.po	2022-04-05 10:00:37.418025258 +0200
+@@ -28303,3 +28303,11 @@ msgstr "Uvezena vjerodajnica"
+ 
+ #~ msgid "This certificate is not viewable"
+ #~ msgstr "Ovaj potvrda nije vidljiva"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Zadani adresar korisnika"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresar:"
+diff -up evolution-3.40.4/po/hu.po.3 evolution-3.40.4/po/hu.po
+--- evolution-3.40.4/po/hu.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/hu.po	2022-04-05 10:00:37.419025257 +0200
+@@ -27314,3 +27314,11 @@ msgstr "Importált tanúsítvány"
+ 
+ #~ msgid "_Destination"
+ #~ msgstr "_Cél"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Alapértelmezett felhasználói címjegyzék"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Címjegyzék:"
+diff -up evolution-3.40.4/po/id.po.3 evolution-3.40.4/po/id.po
+--- evolution-3.40.4/po/id.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/id.po	2022-04-05 10:00:37.421025257 +0200
+@@ -28288,3 +28288,11 @@ msgstr "Sertifikat Yang Diimpor"
+ 
+ #~ msgid "Delivery Notification for “%s”"
+ #~ msgstr "Notifikasi Pengiriman untuk \"%s\""
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Buku Alamat Pengguna Bawaan"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Buku Alamat:"
+diff -up evolution-3.40.4/po/it.po.3 evolution-3.40.4/po/it.po
+--- evolution-3.40.4/po/it.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/it.po	2022-04-05 10:00:37.423025256 +0200
+@@ -29030,3 +29030,11 @@ msgstr "Impossibile scrivere il salvatag
+ #: ../src/smime/lib/e-pkcs12.c:407
+ msgid "Imported Certificate"
+ msgstr "Certificato importato"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Rubrica predefinita dell'utente"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Rubrica:"
+diff -up evolution-3.40.4/po/kk.po.3 evolution-3.40.4/po/kk.po
+--- evolution-3.40.4/po/kk.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/kk.po	2022-04-05 10:00:37.424025255 +0200
+@@ -27302,3 +27302,7 @@ msgstr "Импортталған сер�
+ 
+ #~ msgid "_PostScript"
+ #~ msgstr "_PostScript"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Адрестік кітапша:"
+diff -up evolution-3.40.4/po/ko.po.3 evolution-3.40.4/po/ko.po
+--- evolution-3.40.4/po/ko.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/ko.po	2022-04-05 10:00:37.426025254 +0200
+@@ -28272,3 +28272,11 @@ msgstr "디스크에 저장 내용을 �
+ #: ../src/smime/lib/e-pkcs12.c:407
+ msgid "Imported Certificate"
+ msgstr "가져온 인증서"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "기본 사용자 주소록"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "주소록:"
+diff -up evolution-3.40.4/po/lt.po.3 evolution-3.40.4/po/lt.po
+--- evolution-3.40.4/po/lt.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/lt.po	2022-04-05 10:00:37.428025253 +0200
+@@ -29356,3 +29356,11 @@ msgstr "Importuotas liudijimas"
+ 
+ #~ msgid "Certificate details"
+ #~ msgstr "Liudijimo informacija"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Numatytoji naudotojo adresų knyga"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresų knyga:"
+diff -up evolution-3.40.4/po/lv.po.3 evolution-3.40.4/po/lv.po
+--- evolution-3.40.4/po/lv.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/lv.po	2022-04-05 10:00:37.429025253 +0200
+@@ -26918,3 +26918,11 @@ msgstr "Importēts sertifikāts"
+ 
+ #~ msgid "Evolution Web Inspector"
+ #~ msgstr "Evolution tīmekļa inspektors"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Noklusējuma lietotāja adrešu grāmata"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adrešu grāmata:"
+diff -up evolution-3.40.4/po/nb.po.3 evolution-3.40.4/po/nb.po
+--- evolution-3.40.4/po/nb.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/nb.po	2022-04-05 10:00:37.431025252 +0200
+@@ -27933,3 +27933,11 @@ msgstr "Kan ikke skrive lager til disk.
+ #: ../src/smime/lib/e-pkcs12.c:407
+ msgid "Imported Certificate"
+ msgstr "Importert sertifikat"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Forvalgt adressebok for bruker"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adressebok:"
+diff -up evolution-3.40.4/po/nl.po.3 evolution-3.40.4/po/nl.po
+--- evolution-3.40.4/po/nl.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/nl.po	2022-04-05 10:00:37.432025252 +0200
+@@ -29667,3 +29667,11 @@ msgstr "Geïmporteerd certificaat"
+ # Herinnering geven [15] [minuten] voor het begin van elke afspraak
+ #~ msgid "Sh_ow a reminder"
+ #~ msgstr "Herinnering geven"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Standaardadresboek van gebruiker"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresboek:"
+diff -up evolution-3.40.4/po/pl.po.3 evolution-3.40.4/po/pl.po
+--- evolution-3.40.4/po/pl.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/pl.po	2022-04-05 10:00:37.434025251 +0200
+@@ -28409,3 +28409,11 @@ msgstr "Nie można zapisać przechowalni
+ #: ../src/smime/lib/e-pkcs12.c:407
+ msgid "Imported Certificate"
+ msgstr "Zaimportowany certyfikat"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Domyślna książka adresowa użytkownika"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Książka adresowa:"
+diff -up evolution-3.40.4/po/POTFILES.in.3 evolution-3.40.4/po/POTFILES.in
+--- evolution-3.40.4/po/POTFILES.in.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/POTFILES.in	2022-04-05 10:00:37.392025269 +0200
+@@ -406,6 +406,7 @@ src/modules/backup-restore/org-gnome-bac
+ src/modules/bogofilter/evolution-bogofilter.c
+ src/modules/bogofilter/org.gnome.Evolution-bogofilter.metainfo.xml.in
+ src/modules/book-config-carddav/evolution-book-config-carddav.c
++src/modules/book-config-google/e-google-book-chooser-button.c
+ src/modules/book-config-google/evolution-book-config-google.c
+ src/modules/book-config-ldap/evolution-book-config-ldap.c
+ src/modules/cal-config-caldav/evolution-cal-config-caldav.c
+diff -up evolution-3.40.4/po/pt_BR.po.3 evolution-3.40.4/po/pt_BR.po
+--- evolution-3.40.4/po/pt_BR.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/pt_BR.po	2022-04-05 10:00:37.438025249 +0200
+@@ -29031,3 +29031,11 @@ msgstr "Certificado importado"
+ 
+ #~ msgid "Save name format for drag-and-drop operation"
+ #~ msgstr "Salvar formato de nome para operação de arrastar e soltar"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Catálogo de endereços do usuário padrão"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Catálogo de endereços:"
+diff -up evolution-3.40.4/po/pt.po.3 evolution-3.40.4/po/pt.po
+--- evolution-3.40.4/po/pt.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/pt.po	2022-04-05 10:00:37.436025250 +0200
+@@ -32805,3 +32805,11 @@ msgstr "Certificado importado"
+ 
+ #~ msgid "Checks incoming mail messages to be Junk"
+ #~ msgstr "Verificar nas mensagens recebidas se são Não Solicitadas"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Livro de endereços predefinido do utilizador"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Livro de endereços:"
+diff -up evolution-3.40.4/po/ro.po.3 evolution-3.40.4/po/ro.po
+--- evolution-3.40.4/po/ro.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/ro.po	2022-04-05 10:00:37.439025249 +0200
+@@ -26328,3 +26328,11 @@ msgstr "Certificatul importat"
+ 
+ #~ msgid "_Destination"
+ #~ msgstr "_Destinație"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Agenda utilizatorului implicit"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Agendă:"
+diff -up evolution-3.40.4/po/ru.po.3 evolution-3.40.4/po/ru.po
+--- evolution-3.40.4/po/ru.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/ru.po	2022-04-05 10:00:37.441025248 +0200
+@@ -28144,3 +28144,11 @@ msgstr "Импортированный �
+ #~ msgstr ""
+ #~ "Этот параметр будет использовать токен доступа OAuth 2.0 для подключения "
+ #~ "к серверу"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Адресная книга пользователя по умолчанию"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Адресная книга:"
+diff -up evolution-3.40.4/po/sk.po.3 evolution-3.40.4/po/sk.po
+--- evolution-3.40.4/po/sk.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/sk.po	2022-04-05 10:00:37.443025247 +0200
+@@ -29840,3 +29840,7 @@ msgstr "Importovaný certifikát"
+ # MČ: podpis certifikátu. Až ďalej sa určuje, či sa tento certifikát môže použiť na podpisovanie
+ #~ msgid "Certificate Signature Value"
+ #~ msgstr "Hodnota podpisu certifikátu"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adresár kontaktov:"
+diff -up evolution-3.40.4/po/sl.po.3 evolution-3.40.4/po/sl.po
+--- evolution-3.40.4/po/sl.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/sl.po	2022-04-05 10:00:37.444025246 +0200
+@@ -28539,3 +28539,11 @@ msgstr "Uvoženo potrdilo"
+ 
+ #~ msgid "Certificate"
+ #~ msgstr "Potrdilo"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Privzeti uporabniški imenik"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Imenik:"
+diff -up evolution-3.40.4/po/sr.po.3 evolution-3.40.4/po/sr.po
+--- evolution-3.40.4/po/sr.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/sr.po	2022-04-05 10:00:37.447025245 +0200
+@@ -29869,3 +29869,11 @@ msgstr "Увежено уверење"
+ 
+ #~ msgid "Certificate Signature Value"
+ #~ msgstr "Вредност потписа уверења"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Основни корисников именик"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Именик:"
+diff -up evolution-3.40.4/po/sv.po.3 evolution-3.40.4/po/sv.po
+--- evolution-3.40.4/po/sv.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/sv.po	2022-04-05 10:00:37.450025244 +0200
+@@ -29371,3 +29371,11 @@ msgstr "Importerat certifikat"
+ 
+ #~ msgid "User declined to provide a password"
+ #~ msgstr "Användare avböjde att tillhandahålla ett lösenord"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Standardadressbok för användare"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adressbok:"
+diff -up evolution-3.40.4/po/tr.po.3 evolution-3.40.4/po/tr.po
+--- evolution-3.40.4/po/tr.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/tr.po	2022-04-05 10:00:37.452025243 +0200
+@@ -28728,3 +28728,11 @@ msgstr "Aktarılmış Sertifika"
+ 
+ #~ msgid "Evolution Web Inspector"
+ #~ msgstr "Evolution Web Denetçisi"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Öntanımlı Kullanıcı Adres Defteri"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Adres Defteri:"
+diff -up evolution-3.40.4/po/uk.po.3 evolution-3.40.4/po/uk.po
+--- evolution-3.40.4/po/uk.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/uk.po	2022-04-05 10:00:37.455025241 +0200
+@@ -28418,3 +28418,11 @@ msgstr "Імпортований сер�
+ 
+ #~ msgid "<b>Background Image</b>"
+ #~ msgstr "<b>Зображення тла</b>"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "Типова адресна книга користувача"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "Адресна книга:"
+diff -up evolution-3.40.4/po/zh_CN.po.3 evolution-3.40.4/po/zh_CN.po
+--- evolution-3.40.4/po/zh_CN.po.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/po/zh_CN.po	2022-04-05 10:00:37.457025241 +0200
+@@ -32853,3 +32853,11 @@ msgstr "导入的证书"
+ 
+ #~ msgid "Local Calendars"
+ #~ msgstr "载入日历"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "默认用户通讯录"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "通讯录："
+diff -up evolution-3.40.4/po/ja.po.5 evolution-3.40.4/po/ja.po
+--- evolution-3.40.4/po/ja.po.3	2022-04-08 13:42:12.782532717 +0200
++++ evolution-3.40.4/po/ja.po	2022-04-08 13:42:38.886527919 +0200
+@@ -28035,3 +28035,11 @@ msgstr "インポートした証明書"
+ 
+ #~ msgid "Certificate Signature Value"
+ #~ msgstr "証明書の署名の値"
++
++#: ../src/modules/book-config-google/e-google-book-chooser-button.c:134
++msgid "Default User Address Book"
++msgstr "デフォルトのユーザーアドレス帳"
++
++#: ../src/modules/book-config-google/evolution-book-config-google.c:75
++msgid "Address Book:"
++msgstr "アドレス帳:"
+diff -up evolution-3.40.4/src/e-util/e-source-config.c.3 evolution-3.40.4/src/e-util/e-source-config.c
+--- evolution-3.40.4/src/e-util/e-source-config.c.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/src/e-util/e-source-config.c	2022-04-05 10:00:37.457025241 +0200
+@@ -505,9 +505,10 @@ source_config_init_for_editing_source (E
+ 	backend_name = e_source_backend_get_backend_name (extension);
+ 	g_return_if_fail (backend_name != NULL);
+ 
+-	/* Special-case Google calendars to use 'google' editor, instead
+-	   of the 'caldav' editor, even they use 'caldav' calendar backend. */
+-	if (g_ascii_strcasecmp (backend_name, "caldav") == 0 &&
++	/* Special-case Google books and calendars to use 'google' editor, instead
++	   of the 'carddav'/'caldav' editor, even they use 'carddav'/'caldav' backend. */
++	if ((g_ascii_strcasecmp (backend_name, "caldav") == 0 ||
++	     g_ascii_strcasecmp (backend_name, "carddav") == 0) &&
+ 	    g_strcmp0 (e_source_get_parent (original_source), "google-stub") == 0)
+ 		backend_name = "google";
+ 
+diff -up evolution-3.40.4/src/modules/book-config-google/CMakeLists.txt.3 evolution-3.40.4/src/modules/book-config-google/CMakeLists.txt
+--- evolution-3.40.4/src/modules/book-config-google/CMakeLists.txt.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/src/modules/book-config-google/CMakeLists.txt	2022-04-05 10:00:37.457025241 +0200
+@@ -1,5 +1,7 @@
+ set(extra_deps)
+ set(sources
++	e-google-book-chooser-button.c
++	e-google-book-chooser-button.h
+ 	evolution-book-config-google.c
+ )
+ set(extra_defines)
+diff -up evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.c.3 evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.c
+--- evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.c.3	2022-04-05 10:00:37.457025241 +0200
++++ evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.c	2022-04-05 10:00:37.457025241 +0200
+@@ -0,0 +1,402 @@
++/*
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#include "evolution-config.h"
++
++#include <glib/gi18n-lib.h>
++
++#include <libedataserverui/libedataserverui.h>
++
++#include "e-google-book-chooser-button.h"
++
++struct _EGoogleBookChooserButtonPrivate {
++	ESource *source;
++	ESourceConfig *config;
++	GtkWidget *label;
++};
++
++enum {
++	PROP_0,
++	PROP_SOURCE,
++	PROP_CONFIG
++};
++
++G_DEFINE_DYNAMIC_TYPE_EXTENDED (EGoogleBookChooserButton, e_google_book_chooser_button, GTK_TYPE_BUTTON, 0,
++	G_ADD_PRIVATE_DYNAMIC (EGoogleBookChooserButton))
++
++static void
++google_book_chooser_button_set_source (EGoogleBookChooserButton *button,
++				       ESource *source)
++{
++	g_return_if_fail (E_IS_SOURCE (source));
++	g_return_if_fail (button->priv->source == NULL);
++
++	button->priv->source = g_object_ref (source);
++}
++
++static void
++google_book_chooser_button_set_config (EGoogleBookChooserButton *button,
++				       ESourceConfig *config)
++{
++	g_return_if_fail (E_IS_SOURCE_CONFIG (config));
++	g_return_if_fail (button->priv->config == NULL);
++
++	button->priv->config = g_object_ref (config);
++}
++
++static void
++google_book_chooser_button_set_property (GObject *object,
++					 guint property_id,
++					 const GValue *value,
++					 GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_SOURCE:
++			google_book_chooser_button_set_source (
++				E_GOOGLE_BOOK_CHOOSER_BUTTON (object),
++				g_value_get_object (value));
++			return;
++
++		case PROP_CONFIG:
++			google_book_chooser_button_set_config (
++				E_GOOGLE_BOOK_CHOOSER_BUTTON (object),
++				g_value_get_object (value));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++google_book_chooser_button_get_property (GObject *object,
++					 guint property_id,
++					 GValue *value,
++					 GParamSpec *pspec)
++{
++	switch (property_id) {
++		case PROP_SOURCE:
++			g_value_set_object (
++				value,
++				e_google_book_chooser_button_get_source (
++				E_GOOGLE_BOOK_CHOOSER_BUTTON (object)));
++			return;
++
++		case PROP_CONFIG:
++			g_value_set_object (
++				value,
++				e_google_book_chooser_button_get_config (
++				E_GOOGLE_BOOK_CHOOSER_BUTTON (object)));
++			return;
++	}
++
++	G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
++}
++
++static void
++google_book_chooser_button_dispose (GObject *object)
++{
++	EGoogleBookChooserButton *button = E_GOOGLE_BOOK_CHOOSER_BUTTON (object);
++
++	g_clear_object (&button->priv->source);
++	g_clear_object (&button->priv->config);
++	g_clear_object (&button->priv->label);
++
++	/* Chain up to parent's dispose() method. */
++	G_OBJECT_CLASS (e_google_book_chooser_button_parent_class)->dispose (object);
++}
++
++static void
++google_book_chooser_button_constructed (GObject *object)
++{
++	EGoogleBookChooserButton *button;
++	ESourceWebdav *webdav_extension;
++	GBindingFlags binding_flags;
++	GtkWidget *widget;
++	const gchar *display_name;
++
++	button = E_GOOGLE_BOOK_CHOOSER_BUTTON (object);
++
++	/* Chain up to parent's constructed() method. */
++	G_OBJECT_CLASS (e_google_book_chooser_button_parent_class)->constructed (object);
++
++	widget = gtk_label_new (_("Default User Address Book"));
++	gtk_misc_set_alignment (GTK_MISC (widget), 0.0, 0.5);
++	gtk_container_add (GTK_CONTAINER (button), widget);
++	button->priv->label = g_object_ref (widget);
++	gtk_widget_show (widget);
++
++	webdav_extension = e_source_get_extension (
++		button->priv->source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
++	display_name = e_source_webdav_get_display_name (webdav_extension);
++
++	binding_flags = G_BINDING_DEFAULT;
++	if (display_name != NULL && *display_name != '\0')
++		binding_flags |= G_BINDING_SYNC_CREATE;
++
++	e_binding_bind_property (
++		webdav_extension, "display-name",
++		button->priv->label, "label",
++		binding_flags);
++}
++
++static GtkWindow *
++google_config_get_dialog_parent_cb (ECredentialsPrompter *prompter,
++				    GtkWindow *dialog)
++{
++	return dialog;
++}
++
++static void
++google_book_chooser_button_clicked (GtkButton *btn)
++{
++	EGoogleBookChooserButton *button;
++	gpointer parent;
++	ESourceRegistry *registry;
++	ECredentialsPrompter *prompter;
++	ESourceWebdav *webdav_extension;
++	ESourceAuthentication *authentication_extension;
++	SoupURI *uri;
++	gchar *base_url;
++	GtkDialog *dialog;
++	gulong handler_id;
++	guint supports_filter = 0;
++	const gchar *title = NULL;
++
++	button = E_GOOGLE_BOOK_CHOOSER_BUTTON (btn);
++
++	parent = gtk_widget_get_toplevel (GTK_WIDGET (button));
++	parent = gtk_widget_is_toplevel (parent) ? parent : NULL;
++
++	registry = e_source_config_get_registry (button->priv->config);
++
++	authentication_extension = e_source_get_extension (button->priv->source, E_SOURCE_EXTENSION_AUTHENTICATION);
++	webdav_extension = e_source_get_extension (button->priv->source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
++
++	uri = e_source_webdav_dup_soup_uri (webdav_extension);
++
++	e_google_book_chooser_button_construct_default_uri (uri, e_source_authentication_get_user (authentication_extension));
++
++	/* Prefer 'Google', aka internal OAuth2, authentication method, if available */
++	e_source_authentication_set_method (authentication_extension, "Google");
++
++	/* See https://developers.google.com/people/carddav */
++	soup_uri_set_host (uri, "www.googleapis.com");
++	soup_uri_set_path (uri, "/.well-known/carddav");
++
++	/* Google's CardDAV interface requires a secure connection. */
++	soup_uri_set_scheme (uri, SOUP_URI_SCHEME_HTTPS);
++
++	e_source_webdav_set_soup_uri (webdav_extension, uri);
++
++	prompter = e_credentials_prompter_new (registry);
++	e_credentials_prompter_set_auto_prompt (prompter, FALSE);
++
++	supports_filter = E_WEBDAV_DISCOVER_SUPPORTS_CONTACTS;
++	title = _("Choose an Address Book");
++	base_url = soup_uri_to_string (uri, FALSE);
++
++	dialog = e_webdav_discover_dialog_new (parent, title, prompter, button->priv->source, base_url, supports_filter);
++
++	if (parent != NULL)
++		e_binding_bind_property (
++			parent, "icon-name",
++			dialog, "icon-name",
++			G_BINDING_SYNC_CREATE);
++
++	handler_id = g_signal_connect (prompter, "get-dialog-parent",
++		G_CALLBACK (google_config_get_dialog_parent_cb), dialog);
++
++	e_webdav_discover_dialog_refresh (dialog);
++
++	if (gtk_dialog_run (dialog) == GTK_RESPONSE_ACCEPT) {
++		gchar *href = NULL, *display_name = NULL, *color = NULL, *email;
++		guint supports = 0, order = 0;
++		GtkWidget *content;
++
++		content = e_webdav_discover_dialog_get_content (dialog);
++
++		if (e_webdav_discover_content_get_selected (content, 0, &href, &supports, &display_name, &color, &order)) {
++			soup_uri_free (uri);
++			uri = soup_uri_new (href);
++
++			if (uri) {
++				ESourceAddressBook *addressbook_extension;
++
++				addressbook_extension = e_source_get_extension (button->priv->source, E_SOURCE_EXTENSION_ADDRESS_BOOK);
++
++				e_source_set_display_name (button->priv->source, display_name);
++
++				e_source_webdav_set_display_name (webdav_extension, display_name);
++				e_source_webdav_set_soup_uri (webdav_extension, uri);
++				e_source_webdav_set_order (webdav_extension, order);
++
++				e_source_address_book_set_order (addressbook_extension, order);
++			}
++
++			g_clear_pointer (&href, g_free);
++			g_clear_pointer (&display_name, g_free);
++			g_clear_pointer (&color, g_free);
++		}
++
++		email = e_webdav_discover_content_get_user_address (content);
++		if (email && *email)
++			e_source_webdav_set_email_address (webdav_extension, email);
++		g_free (email);
++	}
++
++	g_signal_handler_disconnect (prompter, handler_id);
++
++	gtk_widget_destroy (GTK_WIDGET (dialog));
++
++	g_object_unref (prompter);
++	if (uri)
++		soup_uri_free (uri);
++	g_free (base_url);
++}
++
++static void
++e_google_book_chooser_button_class_init (EGoogleBookChooserButtonClass *class)
++{
++	GObjectClass *object_class;
++	GtkButtonClass *button_class;
++
++	object_class = G_OBJECT_CLASS (class);
++	object_class->set_property = google_book_chooser_button_set_property;
++	object_class->get_property = google_book_chooser_button_get_property;
++	object_class->dispose = google_book_chooser_button_dispose;
++	object_class->constructed = google_book_chooser_button_constructed;
++
++	button_class = GTK_BUTTON_CLASS (class);
++	button_class->clicked = google_book_chooser_button_clicked;
++
++	g_object_class_install_property (
++		object_class,
++		PROP_SOURCE,
++		g_param_spec_object (
++			"source",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY));
++
++	g_object_class_install_property (
++		object_class,
++		PROP_CONFIG,
++		g_param_spec_object (
++			"config",
++			NULL,
++			NULL,
++			E_TYPE_SOURCE_CONFIG,
++			G_PARAM_READWRITE |
++			G_PARAM_CONSTRUCT_ONLY));
++}
++
++static void
++e_google_book_chooser_button_class_finalize (EGoogleBookChooserButtonClass *class)
++{
++}
++
++static void
++e_google_book_chooser_button_init (EGoogleBookChooserButton *button)
++{
++	button->priv = e_google_book_chooser_button_get_instance_private (button);
++}
++
++void
++e_google_book_chooser_button_type_register (GTypeModule *type_module)
++{
++	/* XXX G_DEFINE_DYNAMIC_TYPE declares a static type registration
++	 *     function, so we have to wrap it with a public function in
++	 *     order to register types from a separate compilation unit. */
++	e_google_book_chooser_button_register_type (type_module);
++}
++
++GtkWidget *
++e_google_book_chooser_button_new (ESource *source,
++				  ESourceConfig *config)
++{
++	g_return_val_if_fail (E_IS_SOURCE (source), NULL);
++
++	return g_object_new (
++		E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON,
++		"source", source,
++		"config", config, NULL);
++}
++
++ESource *
++e_google_book_chooser_button_get_source (EGoogleBookChooserButton *button)
++{
++	g_return_val_if_fail (E_IS_GOOGLE_BOOK_CHOOSER_BUTTON (button), NULL);
++
++	return button->priv->source;
++}
++
++ESourceConfig *
++e_google_book_chooser_button_get_config (EGoogleBookChooserButton *button)
++{
++	g_return_val_if_fail (E_IS_GOOGLE_BOOK_CHOOSER_BUTTON (button), NULL);
++
++	return button->priv->config;
++}
++
++static gchar *
++google_book_chooser_decode_user (const gchar *user)
++{
++	gchar *decoded_user;
++
++	if (user == NULL || *user == '\0')
++		return NULL;
++
++	/* Decode any encoded 'at' symbols ('%40' -> '@'). */
++	if (strstr (user, "%40") != NULL) {
++		gchar **segments;
++
++		segments = g_strsplit (user, "%40", 0);
++		decoded_user = g_strjoinv ("@", segments);
++		g_strfreev (segments);
++
++	/* If no domain is given, append "@gmail.com". */
++	} else if (strstr (user, "@") == NULL) {
++		decoded_user = g_strconcat (user, "@gmail.com", NULL);
++
++	/* Otherwise the user name should be fine as is. */
++	} else {
++		decoded_user = g_strdup (user);
++	}
++
++	return decoded_user;
++}
++
++void
++e_google_book_chooser_button_construct_default_uri (SoupURI *soup_uri,
++						    const gchar *username)
++{
++	gchar *decoded_user, *path;
++
++	decoded_user = google_book_chooser_decode_user (username);
++	if (!decoded_user)
++		return;
++
++	path = g_strdup_printf ("/carddav/v1/principals/%s/lists/default/", decoded_user);
++
++	soup_uri_set_scheme (soup_uri, SOUP_URI_SCHEME_HTTPS);
++	soup_uri_set_user (soup_uri, decoded_user);
++	soup_uri_set_host (soup_uri, "www.googleapis.com");
++	soup_uri_set_path (soup_uri, path);
++
++	g_free (decoded_user);
++	g_free (path);
++}
+diff -up evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.h.3 evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.h
+--- evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.h.3	2022-04-05 10:00:37.457025241 +0200
++++ evolution-3.40.4/src/modules/book-config-google/e-google-book-chooser-button.h	2022-04-05 10:00:37.457025241 +0200
+@@ -0,0 +1,70 @@
++/*
++ * This program is free software; you can redistribute it and/or modify it
++ * under the terms of the GNU Lesser General Public License as published by
++ * the Free Software Foundation.
++ *
++ * This program is distributed in the hope that it will be useful, but
++ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
++ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
++ * for more details.
++ *
++ * You should have received a copy of the GNU Lesser General Public License
++ * along with this program; if not, see <http://www.gnu.org/licenses/>.
++ *
++ */
++
++#ifndef E_GOOGLE_BOOK_CHOOSER_BUTTON_H
++#define E_GOOGLE_BOOK_CHOOSER_BUTTON_H
++
++#include <e-util/e-util.h>
++
++/* Standard GObject macros */
++#define E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON \
++	(e_google_book_chooser_button_get_type ())
++#define E_GOOGLE_BOOK_CHOOSER_BUTTON(obj) \
++	(G_TYPE_CHECK_INSTANCE_CAST \
++	((obj), E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON, EGoogleBookChooserButton))
++#define E_GOOGLE_BOOK_CHOOSER_BUTTON_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_CAST \
++	((cls), E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON, EGoogleBookChooserButtonClass))
++#define E_IS_GOOGLE_BOOK_CHOOSER_BUTTON(obj) \
++	(G_TYPE_CHECK_INSTANCE_TYPE \
++	((obj), E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON))
++#define E_IS_GOOGLE_BOOK_CHOOSER_BUTTON_CLASS(cls) \
++	(G_TYPE_CHECK_CLASS_TYPE \
++	((cls), E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON))
++#define E_GOOGLE_BOOK_CHOOSER_BUTTON_GET_CLASS(obj) \
++	(G_TYPE_INSTANCE_GET_CLASS \
++	((obj), E_TYPE_GOOGLE_BOOK_CHOOSER_BUTTON, EGoogleBookChooserButtonClass))
++
++G_BEGIN_DECLS
++
++typedef struct _EGoogleBookChooserButton EGoogleBookChooserButton;
++typedef struct _EGoogleBookChooserButtonClass EGoogleBookChooserButtonClass;
++typedef struct _EGoogleBookChooserButtonPrivate EGoogleBookChooserButtonPrivate;
++
++struct _EGoogleBookChooserButton {
++	GtkButton parent;
++	EGoogleBookChooserButtonPrivate *priv;
++};
++
++struct _EGoogleBookChooserButtonClass {
++	GtkButtonClass parent_class;
++};
++
++GType		e_google_book_chooser_button_get_type (void);
++void		e_google_book_chooser_button_type_register
++						(GTypeModule *type_module);
++GtkWidget *	e_google_book_chooser_button_new(ESource *source,
++						 ESourceConfig *config);
++ESource *	e_google_book_chooser_button_get_source
++						(EGoogleBookChooserButton *button);
++ESourceConfig *	e_google_book_chooser_button_get_config
++						(EGoogleBookChooserButton *button);
++void		e_google_book_chooser_button_construct_default_uri
++						(SoupURI *soup_uri,
++						 const gchar *username);
++
++G_END_DECLS
++
++#endif /* E_GOOGLE_BOOK_CHOOSER_BUTTON_H */
+diff -up evolution-3.40.4/src/modules/book-config-google/evolution-book-config-google.c.3 evolution-3.40.4/src/modules/book-config-google/evolution-book-config-google.c
+--- evolution-3.40.4/src/modules/book-config-google/evolution-book-config-google.c.3	2021-08-13 11:50:35.000000000 +0200
++++ evolution-3.40.4/src/modules/book-config-google/evolution-book-config-google.c	2022-04-05 10:00:37.458025240 +0200
+@@ -23,6 +23,8 @@
+ 
+ #include <e-util/e-util.h>
+ 
++#include "e-google-book-chooser-button.h"
++
+ typedef ESourceConfigBackend EBookConfigGoogle;
+ typedef ESourceConfigBackendClass EBookConfigGoogleClass;
+ 
+@@ -55,6 +57,7 @@ book_config_google_insert_widgets (ESour
+                                    ESource *scratch_source)
+ {
+ 	ESourceConfig *config;
++	GtkWidget *widget;
+ 	Context *context;
+ 	const gchar *uid;
+ 
+@@ -68,6 +71,10 @@ book_config_google_insert_widgets (ESour
+ 
+ 	context->user_entry = e_source_config_add_user_entry (config, scratch_source);
+ 
++	widget = e_google_book_chooser_button_new (scratch_source, config);
++	e_source_config_insert_widget (config, scratch_source, _("Address Book:"), widget);
++	gtk_widget_show (widget);
++
+ 	e_source_config_add_refresh_interval (config, scratch_source);
+ }
+ 
+@@ -101,23 +108,32 @@ book_config_google_commit_changes (ESour
+ {
+ 	ESource *collection_source;
+ 	ESourceConfig *config;
++	ESourceBackend *addressbook_extension;
++	ESourceWebdav *webdav_extension;
+ 	ESourceAuthentication *extension;
++	SoupURI *soup_uri;
+ 	const gchar *extension_name;
+ 	const gchar *user;
+ 
+ 	config = e_source_config_backend_get_config (backend);
+ 	collection_source = e_source_config_get_collection_source (config);
+ 
++	addressbook_extension = e_source_get_extension (scratch_source, E_SOURCE_EXTENSION_ADDRESS_BOOK);
++	webdav_extension = e_source_get_extension (scratch_source, E_SOURCE_EXTENSION_WEBDAV_BACKEND);
++
+ 	extension_name = E_SOURCE_EXTENSION_AUTHENTICATION;
+ 	extension = e_source_get_extension (scratch_source, extension_name);
+ 
+-	if (!collection_source || (
+-	    !e_source_has_extension (collection_source, E_SOURCE_EXTENSION_GOA) &&
+-	    !e_source_has_extension (collection_source, E_SOURCE_EXTENSION_UOA))) {
+-		e_source_authentication_set_host (extension, "www.google.com");
++	if (!collection_source ||
++	    !e_source_authentication_get_is_external (extension)) {
++		e_source_authentication_set_host (extension, "www.googleapis.com");
+ 		e_source_authentication_set_method (extension, "Google");
+ 	}
+ 
++	/* The backend name is "carddav" even though the ESource is
++	 * a child of the built-in "Google" source. */
++	e_source_backend_set_backend_name (addressbook_extension, "carddav");
++
+ 	user = e_source_authentication_get_user (extension);
+ 	g_return_if_fail (user != NULL);
+ 
+@@ -129,6 +145,19 @@ book_config_google_commit_changes (ESour
+ 		e_source_authentication_set_user (extension, full_user);
+ 		g_free (full_user);
+ 	}
++
++	soup_uri = e_source_webdav_dup_soup_uri (webdav_extension);
++
++	if (!soup_uri->path || !*soup_uri->path || g_strcmp0 (soup_uri->path, "/") == 0) {
++		e_google_book_chooser_button_construct_default_uri (soup_uri, e_source_authentication_get_user (extension));
++	}
++
++	/* Google's CalDAV interface requires a secure connection. */
++	soup_uri_set_scheme (soup_uri, SOUP_URI_SCHEME_HTTPS);
++
++	e_source_webdav_set_soup_uri (webdav_extension, soup_uri);
++
++	soup_uri_free (soup_uri);
+ }
+ 
+ static void
+@@ -159,6 +188,7 @@ e_book_config_google_init (ESourceConfig
+ G_MODULE_EXPORT void
+ e_module_load (GTypeModule *type_module)
+ {
++	e_google_book_chooser_button_type_register (type_module);
+ 	e_book_config_google_register_type (type_module);
+ }
+ 
diff --git a/evolution-3.40.4-new-button.patch b/evolution-3.40.4-new-button.patch
new file mode 100644
index 0000000..3d264dd
--- /dev/null
+++ b/evolution-3.40.4-new-button.patch
@@ -0,0 +1,104 @@
+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);
+ }
+ 
+ /**
diff --git a/evolution.spec b/evolution.spec
new file mode 100644
index 0000000..d7576bb
--- /dev/null
+++ b/evolution.spec
@@ -0,0 +1,3543 @@
+%undefine __cmake_in_source_build
+
+%global _changelog_trimtime %(date +%s -d "1 year ago")
+%global _python_bytecompile_extra 0
+
+# correct Obsoletes for evolution-tests when this is changed
+%global enable_installed_tests 0
+
+%global tnef_support 0
+%if 0%{?fedora}
+%global tnef_support 1
+%endif
+
+%define glib2_version 2.56
+%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 last_anjal_version 0.3.2-3
+%define last_libgal2_version 2:2.5.3-2
+%define last_evo_nm_version 3.5.0
+%define last_evo_perl_version 3.21.90
+
+%define ldap_support 1
+%define libnotify_support 1
+%define libpst_support 1
+
+# Coverity scan can override this to 0, to skip checking in gtk-doc generated code
+%{!?with_docs: %global with_docs 1}
+
+%if 0%{?flatpak}
+%global with_docs 0
+%endif
+
+%define evo_plugin_dir %{_libdir}/evolution/plugins
+
+### Abstract ###
+
+Name: evolution
+Version: 3.40.4
+Release: 9%{?dist}
+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
+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
+
+# Approximate version number
+Provides: bundled(libgnomecanvas) = 2.30.0
+
+Obsoletes: anjal <= %{last_anjal_version}
+Obsoletes: libgal2 <= %{last_libgal2_version}
+Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
+Obsoletes: evolution-perl < %{last_evo_perl_version}
+
+%if !%{enable_installed_tests}
+Obsoletes: evolution-tests <= 3.31.1
+%endif
+
+%global eds_version %{version}
+
+## Dependencies ###
+
+%if ! 0%{?flatpak}
+Requires: %{_bindir}/killall
+Requires: gvfs
+%endif
+Requires: evolution-data-server >= %{eds_version}
+Requires: gspell
+Requires: highlight
+Requires: %{name}-langpacks = %{version}-%{release}
+
+### Build Dependencies ###
+
+%if ! 0%{?flatpak}
+BuildRequires: %{_bindir}/killall
+%endif
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires: gettext
+%if %{with_docs}
+BuildRequires: gtk-doc
+%endif
+BuildRequires: highlight
+BuildRequires: intltool >= %{intltool_version}
+BuildRequires: itstool
+BuildRequires: make
+BuildRequires: pkgconfig
+BuildRequires: yelp-tools
+
+BuildRequires: pkgconfig(atk)
+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}
+BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version}
+BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version}
+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(iso-codes)
+BuildRequires: pkgconfig(libcanberra-gtk3)
+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(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}
+
+%if %{tnef_support}
+BuildRequires: pkgconfig(libytnef)
+%endif
+
+%if %{ldap_support}
+BuildRequires: openldap-devel >= 2.0.11
+%endif
+
+%if %{libnotify_support}
+BuildRequires: pkgconfig(libnotify)
+%endif
+
+%if %{libpst_support}
+BuildRequires: pkgconfig(libpst)
+%endif
+
+%description
+Evolution is the GNOME mailer, calendar, contact manager and
+communications tool.  The components which make up Evolution
+are tightly integrated with one another and act as a seamless
+personal information-management tool.
+
+%package devel
+Summary: Development files for building against %{name}
+Requires: %{name} = %{version}-%{release}
+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(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(libxml-2.0)
+Obsoletes: libgal2-devel <= %{last_libgal2_version}
+
+%description devel
+Development files needed for building things which link against %{name}.
+
+%if %{with_docs}
+
+%package devel-docs
+Summary: Developer documentation for Evolution
+Requires: devhelp
+Requires: %{name}-devel = %{version}-%{release}
+BuildArch: noarch
+
+%description devel-docs
+This package contains developer documentation for Evolution.
+
+%endif
+
+%package langpacks
+Summary: Translations for %{name}
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description langpacks
+This package contains translations for %{name}.
+
+%if %{with_docs}
+%package help
+Summary: Help files for %{name}
+Requires: %{name} = %{version}-%{release}
+Requires: yelp
+BuildArch: noarch
+
+%description help
+This package contains user documentation for %{name}.
+%endif
+
+%package bogofilter
+Summary: Bogofilter plugin for Evolution
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: bogofilter
+
+%description bogofilter
+This package contains the plugin to filter junk mail using Bogofilter.
+
+%package spamassassin
+Summary: SpamAssassin plugin for Evolution
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: spamassassin
+
+%description spamassassin
+This package contains the plugin to filter junk mail using SpamAssassin.
+
+%if %{libpst_support}
+%package pst
+Summary: PST importer plugin for Evolution
+Requires: %{name}%{?_isa} = %{version}-%{release}
+
+%description pst
+This package contains the plugin to import Microsoft Personal Storage Table
+(PST) files used by Microsoft Outlook and Microsoft Exchange.
+%endif
+
+%if %{enable_installed_tests}
+%package tests
+Summary: Tests for the %{name} package
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: python2-behave
+Requires: python2-dogtail
+
+%description tests
+The %{name}-tests package contains tests that can be used to verify
+the functionality of the installed %{name} package.
+%endif
+
+%prep
+%autosetup -p1 -S gendiff
+
+cp %{S:3} data/
+
+# Remove the welcome email from Novell
+for inbox in src/mail/default/*/Inbox; do
+  echo -n "" > $inbox
+done
+
+%if 0%{?flatpak}
+mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i
+cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in
+%endif
+
+%build
+
+# define all of our flags, this is kind of ugly :(
+%if %{ldap_support}
+%define ldap_flags -DWITH_OPENLDAP=ON
+%else
+%define ldap_flags -DWITH_OPENLDAP=OFF
+%endif
+
+%define ssl_flags -DENABLE_SMIME=ON
+
+if ! pkg-config --exists nss; then
+  echo "Unable to find suitable version of mozilla nss to use!"
+  exit 1
+fi
+
+%if %{with_docs}
+%define gtkdoc_flags -DENABLE_GTK_DOC=ON -DWITH_HELP=ON
+%else
+%define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF
+%endif
+
+%if %{enable_installed_tests}
+%define tests_flags -DENABLE_INSTALLED_TESTS=ON
+%else
+%define tests_flags -DENABLE_INSTALLED_TESTS=OFF
+%endif
+
+%if %{tnef_support}
+%global tnef_flags -DENABLE_YTNEF=ON
+%else
+%global tnef_flags -DENABLE_YTNEF=OFF
+%endif
+
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; 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 \
+	%{nil}
+
+%cmake_build
+
+%if %{with_docs}
+
+# Replace identical images in the help by links.
+# This reduces the RPM size by several megabytes.
+helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
+for f in $helpdir/C/figures/*.png; do
+  b="$(basename $f)"
+  for d in $helpdir/*; do
+    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+      g="$d/figures/$b"
+      if [ -f "$g" ]; then
+        if cmp -s $f $g; then
+          rm "$g"; ln -s "../../C/figures/$b" "$g"
+        fi
+      fi
+    fi
+  done
+done
+
+# %%{with_docs}
+%endif
+
+%install
+%cmake_install
+
+%if 0%{?flatpak}
+%{S:1} <%{S:2} >flatpak-evolution-wrapper.sh
+chmod a+x flatpak-evolution-wrapper.sh
+mv $RPM_BUILD_ROOT%{_bindir}/evolution $RPM_BUILD_ROOT%{_bindir}/evolution.bin
+cp flatpak-evolution-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/evolution
+%endif
+
+%find_lang evolution --all-name --with-gnome
+
+grep "%{_datadir}/locale" evolution.lang > translations.lang
+%if %{with_docs}
+grep -v "%{_datadir}/locale" evolution.lang > help.lang
+%endif
+
+%ldconfig_scriptlets
+
+%files
+%license COPYING
+%doc AUTHORS NEWS README.md
+%{_mandir}/man1/*
+
+# GSettings schemas:
+%{_datadir}/GConf/gsettings/evolution.convert
+
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
+
+# The main executable
+%{_bindir}/evolution
+
+%if 0%{?flatpak}
+%{_bindir}/evolution.bin
+%endif
+
+%{_datadir}/metainfo/org.gnome.Evolution.appdata.xml
+
+# Desktop files:
+%{_datadir}/applications/org.gnome.Evolution.desktop
+
+# Icons:
+%{_datadir}/icons/hicolor/16x16/apps/*
+%{_datadir}/icons/hicolor/22x22/apps/*
+%{_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
+# (have not attempted to split this up into an explicit list)
+%dir %{_datadir}/evolution
+%{_datadir}/evolution
+
+# Modules:
+%dir %{_libdir}/evolution
+%dir %{_libdir}/evolution/modules
+%{_libdir}/evolution/modules/module-accounts-window.so
+%{_libdir}/evolution/modules/module-addressbook.so
+%{_libdir}/evolution/modules/module-backup-restore.so
+%{_libdir}/evolution/modules/module-book-config-carddav.so
+%{_libdir}/evolution/modules/module-book-config-google.so
+%{_libdir}/evolution/modules/module-book-config-ldap.so
+%{_libdir}/evolution/modules/module-book-config-local.so
+%{_libdir}/evolution/modules/module-cal-config-caldav.so
+%{_libdir}/evolution/modules/module-cal-config-contacts.so
+%{_libdir}/evolution/modules/module-cal-config-google.so
+%{_libdir}/evolution/modules/module-cal-config-local.so
+%{_libdir}/evolution/modules/module-cal-config-weather.so
+%{_libdir}/evolution/modules/module-cal-config-webcal.so
+%{_libdir}/evolution/modules/module-cal-config-webdav-notes.so
+%{_libdir}/evolution/modules/module-calendar.so
+%{_libdir}/evolution/modules/module-composer-autosave.so
+%{_libdir}/evolution/modules/module-composer-to-meeting.so
+%{_libdir}/evolution/modules/module-config-lookup.so
+%{_libdir}/evolution/modules/module-contact-photos.so
+%{_libdir}/evolution/modules/module-gravatar.so
+%{_libdir}/evolution/modules/module-itip-formatter.so
+%{_libdir}/evolution/modules/module-mail-config.so
+%{_libdir}/evolution/modules/module-mail.so
+%{_libdir}/evolution/modules/module-mailto-handler.so
+%{_libdir}/evolution/modules/module-mdn.so
+%{_libdir}/evolution/modules/module-offline-alert.so
+%{_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-settings.so
+%{_libdir}/evolution/modules/module-startup-wizard.so
+%{_libdir}/evolution/modules/module-text-highlight.so
+%{_libdir}/evolution/modules/module-vcard-inline.so
+%{_libdir}/evolution/modules/module-webkit-editor.so
+%{_libdir}/evolution/modules/module-webkit-inspector.so
+
+%if %{tnef_support}
+%{_libdir}/evolution/modules/module-tnef-attachment.so
+%endif
+
+%{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
+
+# Shared libraries:
+%{_libdir}/evolution/libevolution-mail-composer.so
+%{_libdir}/evolution/libeabutil.so
+%{_libdir}/evolution/libeabwidgets.so
+%{_libdir}/evolution/libecontacteditor.so
+%{_libdir}/evolution/libecontactlisteditor.so
+%{_libdir}/evolution/libecontactprint.so
+%{_libdir}/evolution/libemail-engine.so
+%{_libdir}/evolution/libevolution-mail-formatter.so
+%{_libdir}/evolution/libevolution-shell.so
+%{_libdir}/evolution/libessmime.so
+%{_libdir}/evolution/libevolution-util.so
+%{_libdir}/evolution/libevolution-addressbook-importers.so
+%{_libdir}/evolution/libevolution-calendar.so
+%{_libdir}/evolution/libevolution-calendar-importers.so
+%{_libdir}/evolution/libevolution-mail-importers.so
+%{_libdir}/evolution/libevolution-mail.so
+%{_libdir}/evolution/libevolution-smime.so
+%{_libdir}/evolution/libgnomecanvas.so
+
+# WebKit2 Extensions
+%{_libdir}/evolution/web-extensions/libewebextension.so
+%{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
+
+# Various libexec programs:
+%dir %{_libexecdir}/evolution
+%{_libexecdir}/evolution/evolution-backup
+%{_libexecdir}/evolution/killev
+
+# The plugin directory:
+%dir %{evo_plugin_dir}
+
+# The various plugins follow; they are all part of the main package:
+# (note that there are various resources such as ui and pixmap files that
+# are built as part of specific plugins but which are currently packaged using
+# globs above; the purpose of the separation below is to be more explicit about
+# which plugins we ship)
+%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so
+
+%{evo_plugin_dir}/org-gnome-email-custom-header.eplug
+%{evo_plugin_dir}/liborg-gnome-email-custom-header.so
+
+%{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so
+
+%{evo_plugin_dir}/org-gnome-external-editor.eplug
+%{evo_plugin_dir}/liborg-gnome-external-editor.so
+
+%{evo_plugin_dir}/org-gnome-face.eplug
+%{evo_plugin_dir}/liborg-gnome-face.so
+
+%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug
+%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so
+
+%{evo_plugin_dir}/org-gnome-mail-notification.eplug
+%{evo_plugin_dir}/liborg-gnome-mail-notification.so
+
+%{evo_plugin_dir}/org-gnome-mail-to-task.eplug
+%{evo_plugin_dir}/liborg-gnome-mail-to-task.so
+
+%{evo_plugin_dir}/org-gnome-prefer-plain.eplug
+%{evo_plugin_dir}/liborg-gnome-prefer-plain.so
+
+%{evo_plugin_dir}/org-gnome-publish-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-publish-calendar.so
+
+%{evo_plugin_dir}/org-gnome-save-calendar.eplug
+%{evo_plugin_dir}/liborg-gnome-save-calendar.so
+
+%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so
+
+%{evo_plugin_dir}/org-gnome-templates.eplug
+%{evo_plugin_dir}/liborg-gnome-templates.so
+
+%{evo_plugin_dir}/org-gnome-dbx-import.eplug
+%{evo_plugin_dir}/liborg-gnome-dbx-import.so
+
+
+%files devel
+%{_includedir}/evolution
+%{_libdir}/pkgconfig/evolution-calendar-3.0.pc
+%{_libdir}/pkgconfig/evolution-mail-3.0.pc
+%{_libdir}/pkgconfig/evolution-shell-3.0.pc
+%{_libdir}/pkgconfig/libemail-engine.pc
+
+%if %{with_docs}
+
+%files devel-docs
+%doc %{_datadir}/gtk-doc/html/evolution-mail-composer
+%doc %{_datadir}/gtk-doc/html/evolution-mail-engine
+%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter
+%doc %{_datadir}/gtk-doc/html/evolution-shell
+%doc %{_datadir}/gtk-doc/html/evolution-util
+
+%endif
+
+%files langpacks -f translations.lang
+
+%if %{with_docs}
+%files help -f help.lang
+%endif
+
+%files bogofilter
+%{_libdir}/evolution/modules/module-bogofilter.so
+%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml
+
+%files spamassassin
+%{_libdir}/evolution/modules/module-spamassassin.so
+%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml
+
+%if %{libpst_support}
+%files pst
+%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml
+%{evo_plugin_dir}/org-gnome-pst-import.eplug
+%{evo_plugin_dir}/liborg-gnome-pst-import.so
+%endif
+
+%if %{enable_installed_tests}
+%files tests
+%{_libexecdir}/%{name}/installed-tests
+%{_datadir}/installed-tests
+%endif
+
+%changelog
+* Tue Jan 03 2023 Milan Crha <mcrha@redhat.com> - 3.40.4-9
+- Resolves: #2126524 (Update patch to handle frame flattening change in WebKitGTK)
+
+* 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
+
+* Wed Sep 14 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-7
+- Resolves: #2126524 (Add patch to handle frame flattening change in WebKitGTK)
+
+* Mon Apr 25 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-6
+- Resolves: #2078369 (Disable hardware acceleration for WebKitGTK)
+
+* Fri Apr 08 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-5
+- Related: #2071056 (Update zh_CN and ja translations in the patch)
+
+* 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)
+
+* Mon Feb 14 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-3
+- Resolves: #2054084 (ECompEditor: Timezone can be reset on component save)
+
+* Mon Oct 11 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-2
+- Resolves: #2012701 (Empty emoji picker with gtk3 3.24.30)
+
+* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.40.4-1
+- Related: #1992450 (Update to 3.40.4)
+
+* 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
+
+* Mon Jul 12 2021 Milan Crha <mcrha@redhat.com> - 3.40.3-1
+- Related: #1981215 (Update to 3.40.3)
+
+* Fri Jun 04 2021 Milan Crha <mcrha@redhat.com> - 3.40.2-1
+- Related: #1967855 (Update to 3.40.2)
+
+* Mon May 17 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-2
+- Resolves: #1961194 (Add missing bundled() Provides for libgnomecanvas)
+
+* Fri Apr 30 2021 Milan Crha <mcrha@redhat.com> - 3.40.1-1
+- Related: #1952776 (Update to 3.40.1)
+
+* 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
+
+* Fri Mar 19 2021 Milan Crha <mcrha@redhat.com> - 3.40.0-1
+- Update to 3.40.0
+
+* Fri Mar 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.3-1
+- Update to 3.39.3
+
+* Fri Feb 12 2021 Milan Crha <mcrha@redhat.com> - 3.39.2-1
+- Update to 3.39.2
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Fri Jan 08 2021 Milan Crha <mcrha@redhat.com> - 3.39.1-1
+- Update to 3.39.1
+
+* Fri Nov 20 2020 Milan Crha <mcrha@redhat.com> - 3.38.2-1
+- Update to 3.38.2
+
+* Fri Oct 02 2020 Milan Crha <mcrha@redhat.com> - 3.38.1-1
+- Update to 3.38.1
+
+* Sat Sep 26 2020 Adrian Reber <adrian@lisas.de> - 3.38.0-2
+- Rebuilt for protobuf 3.13
+
+* Fri Sep 11 2020 Milan Crha <mcrha@redhat.com> - 3.38.0-1
+- Update to 3.38.0
+
+* Fri Sep 04 2020 Milan Crha <mcrha@redhat.com> - 3.37.92-1
+- Update to 3.37.92
+
+* Fri Aug 07 2020 Milan Crha <mcrha@redhat.com> - 3.37.90-1
+- Update to 3.37.90
+
+* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.37.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Fri Jul 03 2020 Milan Crha <mcrha@redhat.com> - 3.37.3-1
+- Update to 3.37.3
+
+* Tue Jun 23 2020 Adam Williamson <awilliam@redhat.com> - 3.37.2-2
+- Backport several fixes for annoying bugs from mainline
+
+* Fri May 29 2020 Milan Crha <mcrha@redhat.com> - 3.37.2-1
+- Update to 3.37.2
+
+* Fri Apr 24 2020 Milan Crha <mcrha@redhat.com> - 3.37.1-1
+- Update to 3.37.1
+
+* Fri Mar 27 2020 Milan Crha <mcrha@redhat.com> - 3.36.1-1
+- Update to 3.36.1
+
+* Fri Mar 06 2020 Milan Crha <mcrha@redhat.com> - 3.36.0-1
+- Update to 3.36.0
+
+* Fri Feb 28 2020 Milan Crha <mcrha@redhat.com> - 3.35.92-1
+- Update to 3.35.92
+
+* Fri Feb 14 2020 Milan Crha <mcrha@redhat.com> - 3.35.91-1
+- Update to 3.35.91
+
+* Fri Jan 31 2020 Milan Crha <mcrha@redhat.com> - 3.35.90-1
+- Update to 3.35.90
+
+* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 3.35.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Thu Jan 16 2020 Kalev Lember <klember@redhat.com> - 3.35.3-3
+- Rebuilt for libgnome-desktop soname bump
+
+* Mon Jan 06 2020 Milan Crha <mcrha@redhat.com> - 3.35.3-2
+- Enable TNEF support for Fedora
+
+* Fri Jan 03 2020 Milan Crha <mcrha@redhat.com> - 3.35.3-1
+- Update to 3.35.3
+
+* Fri Nov 22 2019 Milan Crha <mcrha@redhat.com> - 3.35.2-1
+- Update to 3.35.2
+
+* Fri Oct 11 2019 Milan Crha <mcrha@redhat.com> - 3.35.1-1
+- Update to 3.35.1
+
+* Mon Oct 07 2019 Milan Crha <mcrha@redhat.com> - 3.34.1-1
+- Update to 3.34.1
+
+* Mon Sep 09 2019 Milan Crha <mcrha@redhat.com> - 3.34.0-1
+- Update to 3.34.0
+
+* Mon Sep 02 2019 Milan Crha <mcrha@redhat.com> - 3.33.92-1
+- Update to 3.33.92
+
+* Mon Aug 19 2019 Milan Crha <mcrha@redhat.com> - 3.33.91-1
+- Update to 3.33.91
+
+* Mon Aug 05 2019 Milan Crha <mcrha@redhat.com> - 3.33.90-1
+- Update to 3.33.90
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.33.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Sun Jul 21 2019 Kalev Lember <klember@redhat.com> - 3.33.4-2
+- Rebuilt for libgnome-desktop soname bump
+
+* Mon Jul 15 2019 Milan Crha <mcrha@redhat.com> - 3.33.4-1
+- Update to 3.33.4
+
+* Mon Jul 08 2019 Kalev Lember <klember@redhat.com> - 3.33.3-2
+- Rebuilt for libgweather soname bump
+
+* Mon Jun 17 2019 Milan Crha <mcrha@redhat.com> - 3.33.3-1
+- Update to 3.33.3
+
+* Mon May 20 2019 Milan Crha <mcrha@redhat.com> - 3.33.2-1
+- Update to 3.33.2
+
+* Mon Apr 22 2019 Milan Crha <mcrha@redhat.com> - 3.33.1-1
+- Update to 3.33.1
+
+* Mon Apr 08 2019 Milan Crha <mcrha@redhat.com> - 3.32.1-1
+- Update to 3.32.1
+
+* Mon Mar 11 2019 Milan Crha <mcrha@redhat.com> - 3.32.0-1
+- Update to 3.32.0
+
+* Mon Mar 04 2019 Milan Crha <mcrha@redhat.com> - 3.31.92-1
+- Update to 3.31.92
+
+* Mon Feb 18 2019 Milan Crha <mcrha@redhat.com> - 3.31.91-1
+- Update to 3.31.91
+
+* Mon Feb 04 2019 Milan Crha <mcrha@redhat.com> - 3.31.90-1
+- Update to 3.31.90
+
+* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 3.31.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Mon Jan 07 2019 Milan Crha <mcrha@redhat.com> - 3.31.4-1
+- Update to 3.31.4
+
+* Mon Dec 10 2018 Milan Crha <mcrha@redhat.com> - 3.31.3-1
+- Update to 3.31.3
+
+* Mon Nov 12 2018 Milan Crha <mcrha@redhat.com> - 3.31.2-1
+- Update to 3.31.2
+
+* Fri Oct 26 2018 Milan Crha <mcrha@redhat.com> - 3.31.1-2
+- Obsolete evolution-tests subpackage
+- Add BuildRequires/Requires for 'killall' binary
+
+* Mon Oct 08 2018 Milan Crha <mcrha@redhat.com> - 3.31.1-1
+- Update to 3.31.1
+
+* Mon Sep 24 2018 Milan Crha <mcrha@redhat.com> - 3.30.1-1
+- Update to 3.30.1
+- Remove patch for GNOME Evolution issue #86 (fixed upstream)
+- Disable tests subpackage - it uses python2 and it is unmaintained upstream
+- Remove BuildRequires on bogofilter and spamassassin
+
+* Mon Sep 03 2018 Milan Crha <mcrha@redhat.com> - 3.30.0-1
+- Update to 3.30.0
+- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
+
+* Mon Aug 27 2018 Milan Crha <mcrha@redhat.com> - 3.29.92-1
+- Update to 3.29.92
+
+* Mon Aug 13 2018 Milan Crha <mcrha@redhat.com> - 3.29.91-1
+- Update to 3.29.91
+
+* Mon Jul 30 2018 Milan Crha <mcrha@redhat.com> - 3.29.90-1
+- Update to 3.29.90
+
+* Mon Jul 16 2018 Milan Crha <mcrha@redhat.com> - 3.29.4-1
+- Update to 3.29.4
+- Change dependencies of the tests subpackage and do not precompile the scripts there
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.29.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
+
+* Mon Jun 18 2018 Milan Crha <mcrha@redhat.com> - 3.29.3-1
+- Update to 3.29.3
+
+* Mon May 21 2018 Milan Crha <mcrha@redhat.com> - 3.29.2-1
+- Update to 3.29.2
+
+* Mon Apr 16 2018 Milan Crha <mcrha@redhat.com> - 3.29.1-1
+- Update to 3.29.1
+- Remove fix to strip closing > from URLs when linkifying (BGO#795108) (Fixed upstream)
+
+* Tue Apr 10 2018 Adam Williamson <awilliam@redhat.com> - 3.28.1-2
+- Backport fix to strip closing > from URLs when linkifying (BGO#795108)
+
+* Mon Apr 09 2018 Milan Crha <mcrha@redhat.com> - 3.28.1-1
+- Update to 3.28.1
+
+* Mon Mar 12 2018 Milan Crha <mcrha@redhat.com> - 3.28.0-1
+- Update to 3.28.0
+
+* Mon Mar 05 2018 Milan Crha <mcrha@redhat.com> - 3.27.92-1
+- Update to 3.27.92
+
+* Mon Feb 19 2018 Milan Crha <mcrha@redhat.com> - 3.27.91-1
+- Update to 3.27.91
+
+* Tue Feb 13 2018 Björn Esser <besser82@fedoraproject.org> - 3.27.90-3
+- Rebuild against newer gnome-desktop3 package
+
+* Fri Feb 09 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.27.90-2
+- Escape macros in %%changelog
+
+* Tue Feb 06 2018 Milan Crha <mcrha@redhat.com> - 3.27.90-1
+- Update to 3.27.90
+- Properly obsolete evolution-perl subpackage
+
+* Mon Feb 05 2018 Kalev Lember <klember@redhat.com> - 3.27.4-2
+- Rebuilt for libgweather soname bump
+
+* Mon Jan 08 2018 Milan Crha <mcrha@redhat.com> - 3.27.4-1
+- Update to 3.27.4
+
+* Sat Jan 06 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 3.27.3-2
+- Remove obsolete scriptlets
+- Add explicit dependency on evolution-data-server (RH bug #1524416)
+
+* Mon Dec 11 2017 Milan Crha <mcrha@redhat.com> - 3.27.3-1
+- Update to 3.27.3
+
+* Mon Nov 13 2017 Milan Crha <mcrha@redhat.com> - 3.27.2-1
+- Update to 3.27.2
+
+* Wed Nov 08 2017 Milan Crha <mcrha@redhat.com> - 3.27.1-2
+- Rebuild for newer libical
+
+* Mon Oct 16 2017 Milan Crha <mcrha@redhat.com> - 3.27.1-1
+- Update to 3.27.1
+
+* Mon Oct 02 2017 Milan Crha <mcrha@redhat.com> - 3.26.1-1
+- Update to 3.26.1
+
+* Mon Sep 11 2017 Milan Crha <mcrha@redhat.com> - 3.26.0-1
+- Update to 3.26.0
+
+* Mon Sep 04 2017 Milan Crha <mcrha@redhat.com> - 3.25.92.2-1
+- Update to 3.25.92.2
+
+* Mon Sep 04 2017 Milan Crha <mcrha@redhat.com> - 3.25.92-1
+- Update to 3.25.92
+
+* Tue Aug 22 2017 Ville Skyttä <ville.skytta@iki.fi> - 3.25.91-2
+- Install COPYING as %%license
+
+* Mon Aug 21 2017 Milan Crha <mcrha@redhat.com> - 3.25.91-1
+- Update to 3.25.91
+
+* Mon Aug 07 2017 Milan Crha <mcrha@redhat.com> - 3.25.90-1
+- Update to 3.25.90
+
+* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
+
+* Mon Jul 31 2017 Florian Weimer <fweimer@redhat.com> - 3.25.4-3
+- Rebuild with binutils fix for ppc64le (#1475636)
+
+* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.25.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
+
+* Mon Jul 17 2017 Milan Crha <mcrha@redhat.com> - 3.25.4-1
+- Update to 3.25.4
+
+* Mon Jun 19 2017 Milan Crha <mcrha@redhat.com> - 3.25.3-1
+- Update to 3.25.3
+
+* Mon May 22 2017 Milan Crha <mcrha@redhat.com> - 3.25.2-1
+- Update to 3.25.2
+
+* Thu Apr 27 2017 Milan Crha <mcrha@redhat.com> - 3.25.1-2
+- Split translations into separate package
+
+* Mon Apr 24 2017 Milan Crha <mcrha@redhat.com> - 3.25.1-1
+- Update to 3.25.1
+
+* Mon Apr 10 2017 Milan Crha <mcrha@redhat.com> - 3.24.1-1
+- Update to 3.24.1
+
+* Mon Mar 20 2017 Milan Crha <mcrha@redhat.com> - 3.24.0-1
+- Update to 3.24.0
+
+* Mon Mar 13 2017 Milan Crha <mcrha@redhat.com> - 3.23.92-1
+- Update to 3.23.92
+
+* Mon Feb 27 2017 Milan Crha <mcrha@redhat.com> - 3.23.91-1
+- Update to 3.23.91
+
+* Mon Feb 13 2017 Milan Crha <mcrha@redhat.com> - 3.23.90-1
+- Update to 3.23.90
+
+* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 3.23.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
+
+* Mon Jan 16 2017 Milan Crha <mcrha@redhat.com> - 3.23.4-1
+- Update to 3.23.4
+
+* Mon Dec 12 2016 Milan Crha <mcrha@redhat.com> - 3.23.3-1
+- Update to 3.23.3
+
+* Mon Nov 21 2016 Milan Crha <mcrha@redhat.com> - 3.23.2-1
+- Update to 3.23.2
+
+* Sun Nov 06 2016 Filipe Rosset <rosset.filipe@gmail.com> - 3.23.1-2
+- Rebuild for newer highlight
+
+* Mon Oct 24 2016 Milan Crha <mcrha@redhat.com> - 3.23.1-1
+- Update to 3.23.1
+
+* Thu Oct 13 2016 Milan Crha <mcrha@redhat.com> - 3.22.1-2
+- Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess)
+
+* Mon Oct 10 2016 Milan Crha <mcrha@redhat.com> - 3.22.1-1
+- Update to 3.22.1
+
+* Mon Sep 19 2016 Milan Crha <mcrha@redhat.com> - 3.22.0-1
+- Update to 3.22.0
+- Add gnome-autoar dependency
+
+* 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)
+
+* Thu Sep 01 2016 Tomas Popela <tpopela@redhat.com> - 3.21.91-2
+- Adapt to WebKit Unstable DOM API changes
+
+* Mon Aug 29 2016 Milan Crha <mcrha@redhat.com> - 3.21.91-1
+- Update to 3.21.91
+
+* Mon Aug 15 2016 Milan Crha <mcrha@redhat.com> - 3.21.90-1
+- Update to 3.21.90
+
+* Mon Jul 18 2016 Milan Crha <mcrha@redhat.com> - 3.21.4-1
+- Update to 3.21.4
+- Remove the "perl" subpackage (code moved to the evolution-data-server)
+
+* Mon Jun 20 2016 Milan Crha <mcrha@redhat.com> - 3.21.3-1
+- Update to 3.21.3
+
+* Mon May 23 2016 Milan Crha <mcrha@redhat.com> - 3.21.2-1
+- Update to 3.21.2
+
+* Mon Apr 25 2016 Milan Crha <mcrha@redhat.com> - 3.21.1-1
+- Update to 3.21.1
+
+* Fri Apr 15 2016 David Tardon <dtardon@redhat.com> - 3.20.1-2
+- rebuild for ICU 57.1
+
+* Mon Apr 11 2016 Milan Crha <mcrha@redhat.com> - 3.20.1-1
+- Update to 3.20.1
+
+* Mon Mar 21 2016 Milan Crha <mcrha@redhat.com> - 3.20.0-1
+- Update to 3.20.0
+
+* Mon Mar 14 2016 Milan Crha <mcrha@redhat.com> - 3.19.92-1
+- Update to 3.19.92
+
+* Mon Feb 29 2016 Milan Crha <mcrha@redhat.com> - 3.19.91-1
+- Update to 3.19.91
+- Remove patch for GNOME bug 761883 (Fixed upstream)
+
+* Thu Feb 18 2016 Milan Crha <mcrha@redhat.com> - 3.19.90-2
+- Add patch for GNOME bug 761883 (Typo in the previous fix)
+
+* Mon Feb 15 2016 Milan Crha <mcrha@redhat.com> - 3.19.90-1
+- Update to 3.19.90
+
+* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 3.19.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
+
+* Mon Jan 18 2016 David Tardon <dtardon@redhat.com> - 3.19.4-2
+- rebuild for libical 2.0.0
+
+* Mon Jan 18 2016 Milan Crha <mcrha@redhat.com> - 3.19.4-1
+- Update to 3.19.4
+
+* Mon Dec 14 2015 Milan Crha <mcrha@redhat.com> - 3.19.3-1
+- Update to 3.19.3
+
+* Mon Nov 23 2015 Milan Crha <mcrha@redhat.com> - 3.19.2-1
+- Update to 3.19.2
+
+* Mon Oct 26 2015 Milan Crha <mcrha@redhat.com> - 3.19.1-1
+- Update to 3.19.1
+
+* Mon Oct 12 2015 Milan Crha <mcrha@redhat.com> - 3.18.1-1
+- Update to 3.18.1
+
+* Mon Sep 21 2015 Milan Crha <mcrha@redhat.com> - 3.18.0-1
+- Update to 3.18.0
+
+* Mon Sep 14 2015 Milan Crha <mcrha@redhat.com> - 3.17.92-1
+- Update to 3.17.92
+- Add pkgconfig(iso-codes) into BuildRequires
+
+* Mon Aug 31 2015 Milan Crha <mcrha@redhat.com> - 3.17.91-1
+- Update to 3.17.91
+
+* Mon Aug 17 2015 Milan Crha <mcrha@redhat.com> - 3.17.90-1
+- Update to 3.17.90
+
+* Wed Jul 22 2015 Milan Crha <mcrha@redhat.com> - 3.17.4-2
+- Rebuild for newer gnome-desktop3
+
+* Mon Jul 20 2015 Milan Crha <mcrha@redhat.com> - 3.17.4-1
+- Update to 3.17.4
+
+* Mon Jun 22 2015 Milan Crha <mcrha@redhat.com> - 3.17.3-1
+- Update to 3.17.3
+- Disable help build when gtk-doc is disabled
+
+* Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.17.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Mon May 25 2015 Milan Crha <mcrha@redhat.com> - 3.17.2-1
+- Update to 3.17.2
+- Remove patch for a removal of an e-cell-renderer-color gtk-doc leftover (fixed upstream)
+
+* Mon Apr 27 2015 Milan Crha <mcrha@redhat.com> - 3.17.1-1
+- Update to 3.17.1
+- Add patch for a removal of an e-cell-renderer-color gtk-doc leftover
+
+* Mon Apr 13 2015 Milan Crha <mcrha@redhat.com> - 3.16.1-1
+- Update to 3.16.1
+
+* Mon Mar 23 2015 Milan Crha <mcrha@redhat.com> - 3.16.0-1
+- Update to 3.16.0
+
+* Mon Mar 16 2015 Milan Crha <mcrha@redhat.com> - 3.15.92-1
+- Update to 3.15.92
+- Remove obsolete patches (one unused and one fixed upstream)
+
+* Mon Mar 02 2015 Milan Crha <mcrha@redhat.com> - 3.15.91-1
+- Update to 3.15.91
+
+* Mon Feb 16 2015 Milan Crha <mcrha@redhat.com> - 3.13.90-1
+- Update to 3.13.90
+- Remove WebKit composer patches (fixed upstream)
+
+* Mon Feb 02 2015 Tomas Popela <tpopela@redhat.com> - 3.13.10-2
+- Backport the WebKit composer patches
+
+* Mon Jan 26 2015 Milan Crha <mcrha@redhat.com> - 3.13.10-1
+- Update to 3.13.10
+
+* Mon Dec 22 2014 Milan Crha <mcrha@redhat.com> - 3.13.9-1
+- Update to 3.13.9
+
+* Mon Nov 24 2014 Milan Crha <mcrha@redhat.com> - 3.13.8-1
+- Update to 3.13.8
+
+* Mon Oct 27 2014 Milan Crha <mcrha@redhat.com> - 3.13.7-1
+- Update to 3.13.7
+
+* Mon Sep 22 2014 Milan Crha <mcrha@redhat.com> - 3.13.6-1
+- Update to 3.13.6
+
+* Mon Aug 25 2014 Milan Crha <mcrha@redhat.com> - 3.13.5-1
+- Update to 3.13.5
+- Remove patch to add missing tests files in the distribution tarball (fixed upstream)
+
+* Sat Aug 16 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
+
+* Wed Jul 30 2014 Milan Crha <mcrha@redhat.com> - 3.13.4-1
+- Update to 3.13.4
+- Introduce tests subpackage with installed tests
+- Add patch to add missing tests files in the distribution tarball
+- Remove patch to drop gnome-icon-theme dependency (fixed upstream)
+
+* Mon Jul 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.4-1
+- Update to 3.12.4
+- Remove patch to fix folder names in Mail view's folder tree (fixed upstream)
+- Remove patch to fix colors in preview (fixed upstream)
+
+* Thu Jun 26 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-3
+- Add upstream patch to fix folder names in Mail view's folder tree
+- Add upstream patch to fix colors in preview
+
+* Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-2
+- Drop gnome-icon-theme dependency
+
+* Mon Jun 09 2014 Milan Crha <mcrha@redhat.com> - 3.12.3-1
+- Update to 3.12.3
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.12.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Mon May 12 2014 Milan Crha <mcrha@redhat.com> - 3.12.2-1
+- Update to 3.12.2
+
+* Wed Apr 16 2014 Adam Williamson <awilliam@redhat.com> - 3.12.1-2
+- rebuild for new libgdata
+
+* Mon Apr 14 2014 Milan Crha <mcrha@redhat.com> - 3.12.1-1
+- Update to 3.12.1
+
+* Mon Mar 24 2014 Milan Crha <mcrha@redhat.com> - 3.12.0-1
+- Update to 3.12.0
+
+* Mon Mar 17 2014 Milan Crha <mcrha@redhat.com> - 3.11.92-1
+- Update to 3.11.92
+
+* Mon Mar 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.91-1
+- Update to 3.11.91
+
+* Wed Feb 19 2014 Kalev Lember <kalevlember@gmail.com> - 3.11.90-2
+- Rebuilt for libgnome-desktop soname bump
+
+* Mon Feb 17 2014 Milan Crha <mcrha@redhat.com> - 3.11.90-1
+- Update to 3.11.90
+
+* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-2
+- Drop krb5 dependency
+
+* Mon Feb 03 2014 Milan Crha <mcrha@redhat.com> - 3.11.5-1
+- Update to 3.11.5
+
+* Fri Jan 17 2014 Adam Williamson <awilliam@redhat.com> - 3.11.4-2
+- backport a couple of crasher fixes from upstream master
+
+* Mon Jan 13 2014 Milan Crha <mcrha@redhat.com> - 3.11.4-1
+- Update to 3.11.4
+
+* Thu Nov 21 2013 Milan Crha <mcrha@redhat.com> - 3.11.2-2
+- Rebuild for new libical (RH bug #1023020)
+
+* Mon Nov 18 2013 Milan Crha <mcrha@redhat.com> - 3.11.2-1
+- Update to 3.11.2
+- Conditionally build help subpackage
+- Disable compiler warnings about deprecated symbols
+
+* Mon Nov 11 2013 Milan Crha <mcrha@redhat.com> - 3.11.1-2
+- Hide more help-related widgets when evolution-help is not installed
+
+* Tue Oct 22 2013 Matthew Barnes <mbarnes@redhat.com> - 3.11.1-1
+- Update to 3.11.1
+
+* Mon Oct 14 2013 Milan Crha <mcrha@redhat.com> - 3.10.1-1
+- Update to 3.10.1
+- Remove the dependency on libytnef, which apparently isn't needed for
+  the PST importer and disable the experimental TNEF attachments plugin
+- Avoid help launch with F1 when evolution-help is not installed
+
+* Mon Sep 23 2013 Milan Crha <mcrha@redhat.com> - 3.10.0-1
+- Update to 3.10.0
+- Remove explicit Requires on libpst in pst subpackage
+
+* Mon Sep 16 2013 Milan Crha <mcrha@redhat.com> - 3.9.92-1
+- Update to 3.9.92
+
+* Tue Sep 03 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.91-2
+- Rebuilt for libgnome-desktop soname bump
+
+* Mon Sep 02 2013 Milan Crha <mcrha@redhat.com> - 3.9.91-1
+- Update to 3.9.91
+
+* Fri Aug 23 2013 Milan Crha <mcrha@redhat.com> - 3.9.90-2
+- Split developer documentation into evolution-devel-docs subpackage
+
+* Mon Aug 19 2013 Milan Crha <mcrha@redhat.com> - 3.9.90-1
+- Update to 3.9.90
+
+* Tue Aug 06 2013 Adam Williamson <awilliam@redhat.com> - 3.9.5-3
+- rebuild for new libgweather
+
+* Thu Aug 01 2013 Petr Pisar <ppisar@redhat.com> - 3.9.5-2
+- Perl 5.18 rebuild
+
+* Mon Jul 29 2013 Milan Crha <mcrha@redhat.com> - 3.9.5-1
+- Update to 3.9.5
+
+* Wed Jul 17 2013 Matthew Barnes <mbarnes@redhat.com> - 3.9.4-3
+- Work around a crash caught by -fstack-protector-strong.
+
+* Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 3.9.4-2
+- Perl 5.18 rebuild
+
+* Mon Jul 08 2013 Milan Crha <mcrha@redhat.com> - 3.9.4-1
+- Update to 3.9.4
+
+* Sat Jun 22 2013 Matthias Clasen <mclasen@redhat.com> - 3.9.3-3
+- Don't install ChangeLog
+- Trim %%changelog
+
+* Fri Jun 21 2013 Kalev Lember <kalevlember@gmail.com> - 3.9.3-2
+- Rebuilt for libgweather 3.9.3 soname bump
+
+* Mon Jun 17 2013 Milan Crha <mcrha@redhat.com> - 3.9.3-1
+- Update to 3.9.3
+
+* Mon May 27 2013 Milan Crha <mcrha@redhat.com> - 3.9.2-1
+- Update to 3.9.2
+
+* Fri May 24 2013 Rex Dieter <rdieter@fedoraproject.org> 3.9.1-2
+- rebuild (libical)
+
+* Mon Apr 29 2013 Milan Crha <mcrha@redhat.com> - 3.9.1-1
+- Update to 3.9.1
+
+* Mon Mar 25 2013 Milan Crha <mcrha@redhat.com> - 3.8.0-1
+- Update to 3.8.0
+
+* Mon Mar 18 2013 Milan Crha <mcrha@redhat.com> - 3.7.92-1
+- Update to 3.7.92
+
+* Mon Mar 04 2013 Milan Crha <mcrha@redhat.com> - 3.7.91-1
+- Update to 3.7.91
+
+* Wed Feb 20 2013 Kalev Lember <kalevlember@gmail.com> - 3.7.90-2
+- Rebuilt for libgnome-desktop soname bump
+
+* Mon Feb 18 2013 Milan Crha <mcrha@redhat.com> - 3.7.90-1
+- Update to 3.7.90
+
+* Mon Feb 04 2013 Milan Crha <mcrha@redhat.com> - 3.7.5-1
+- Update to 3.7.5
+
+* Fri Jan 18 2013 Milan Crha <mcrha@redhat.com> - 3.7.4-1
+- Correct help-context patch test path (Red Had bug #901341)
+
+* Mon Jan 14 2013 Milan Crha <mcrha@redhat.com> - 3.7.4-1
+- Update to 3.7.4
+- Add --add-missing to automake call
+
+* Tue Jan 01 2013 Matthew Barnes <mbarnes@redhat.com> - 3.7.3.2-3
+- Re-enable translation size reduction (RH bug #628073 is long fixed).
+
+* Thu Dec 20 2012 Kalev Lember <kalevlember@gmail.com> - 3.7.3.2-2
+- Rebuilt for libgnome-desktop3 3.7.3 soname bump
+
+* Wed Dec 19 2012 Matthew Barnes <mbarnes@redhat.com> - 3.7.3.2-1
+- Update to 3.7.3.2
+- Remove obsolete BuildRequires:
+    bison
+    dbus-glib-devel
+    libSM-devel
+    rarian-compat
+
+* Mon Nov 19 2012 Milan Crha <mcrha@redhat.com> - 3.7.2-1
+- Update to 3.7.2
+
+* Fri Nov 09 2012 Matthew Barnes <mbarnes@redhat.com> - 3.7.1-2
+- Drop unique3-devel BR, it's an ancient artifact.
+
+* Mon Oct 22 2012 Milan Crha <mcrha@redhat.com> - 3.7.1-1
+- Update to 3.7.1
+
+* Mon Sep 24 2012 Matthew Barnes <mbarnes@redhat.com> - 3.6.0-1
+- Update to 3.6.0
+- Remove patch for GNOME #678408 (fixed upstream).
+
+* Mon Sep 24 2012 Bastien Nocera <bnocera@redhat.com> 3.5.92-4
+- Use GStreamer 1.0 instead of 0.10
+
+* Sat Sep 22 2012 Adam Williamson <awilliam@redhat.com> - 3.5.92-3
+- backport fix for BGO #678408 (broken message display)
+
+* Wed Sep 19 2012 Kalev Lember <kalevlember@gmail.com> - 3.5.92-2
+- Fix evolution-NetworkManager obsoletes
+
+* Mon Sep 17 2012 Milan Crha <mcrha@redhat.com> - 3.5.92-1
+- Update to 3.5.92
+
+* Mon Sep 03 2012 Milan Crha <mcrha@redhat.com> - 3.5.91-1
+- Update to 3.5.91
+
+* Mon Aug 20 2012 Milan Crha <mcrha@redhat.com> - 3.5.90-1
+- Update to 3.5.90
+- Remove patches for BGO #678408 and #681321 (fixed upstream)
+- Add itstool and yelp-tools into BuildRequires
+
+* Wed Aug 15 2012 Adam Williamson <awilliam@redhat.com> - 3.5.5-2
+- backport the fix for BGO #678408 and #681321 (libxml2 build)
+
+* Mon Aug 06 2012 Milan Crha <mcrha@redhat.com> - 3.5.5-1
+- Update to 3.5.5
+
+* Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+
+* Mon Jul 16 2012 Milan Crha <mcrha@redhat.com> - 3.5.4-1
+- Update to 3.5.4
+- Enable weather plugin (fixed upstream)
+
+* Wed Jun 27 2012 Matthias Clasen <mclasen@redhat.com> - 2.5.3.1-4
+- Temporarily disable weather plugin (not ported to new libgweather yet)
+
+* Tue Jun 26 2012 Matthew Barnes <mbarnes@redhat.com> - 2.5.3.1-3
+- Temporarily change e-d-s req in devel subpackage.
+
+* Tue Jun 26 2012 Matthew Barnes <mbarnes@redhat.com> - 3.5.3.1-2
+- Remove unnecessary Requires: evolution-data-server.
+
+* Mon Jun 25 2012 Matthew Barnes <mbarnes@redhat.com> - 3.5.3.1-1
+- Update to 3.5.3.1 (3.5.3, no build for you!)
+
+* Mon Jun 25 2012 Matthew Barnes <mbarnes@redhat.com> - 3.5.3-1
+- Update to 3.5.3
+- Drop BR: GConf2-devel  \o/
+
+* Fri Jun  8 2012 Matthias Clasen <mclasen@redhat.com> - 3.5.2-2
+- Rebuild against new gnome-desktop
+
+* Mon Jun 04 2012 Milan Crha <mcrha@redhat.com> - 3.5.2-1
+- Update to 3.5.2
+
+* Sun Apr 29 2012 Matthew Barnes <mbarnes@redhat.com> - 3.5.1-1
+- Update to 3.5.1
+- Add BR: webkitgtk3-devel
+
+* Tue Apr 24 2012 Kalev Lember <kalevlember@gmail.com> - 3.4.1-2
+- Silence rpm scriptlet output
+
+* Mon Apr 16 2012 Milan Crha <mcrha@redhat.com> - 3.4.1-1
+- Update to 3.4.1
+
+* Tue Mar 27 2012 Milan Crha <mcrha@redhat.com> - 3.4.0.1-1
+- Update to 3.4.0.1
+
+* Mon Mar 19 2012 Milan Crha <mcrha@redhat.com> - 3.3.92-1
+- Update to 3.3.92
+
+* Tue Mar 06 2012 Milan Crha <mcrha@redhat.com> - 3.3.91-1
+- Update to 3.3.91
+
+* Mon Feb 20 2012 Milan Crha <mcrha@redhat.com> - 3.3.90-1
+- Update to 3.3.90
+
+* Mon Feb 06 2012 Milan Crha <mcrha@redhat.com> - 3.3.5-1
+- Update to 3.3.5
+
+* Thu Jan 19 2012 Matthew Barnes <mbarnes@redhat.com> - 3.3.4-2
+- Keep all GSettings schema files in the main evolution package, even the
+  ones for the Bogofilter and Spamassassin subpackages, since we just have
+  one .convert file and missing schemas makes gsettings-data-convert crash.
+
+* Mon Jan 16 2012 Milan Crha <mcrha@redhat.com> - 3.3.4-1
+- Update to 3.3.4
+
+* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.3.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Mon Dec 19 2011 Milan Crha <mcrha@redhat.com> - 3.3.3-1
+- Update to 3.3.3
+
+* Mon Nov 21 2011 Milan Crha <mcrha@redhat.com> - 3.3.2-1
+- Update to 3.3.2
+- Remove patch to not call g_thread_init() (fixed upstream)
+
+* Fri Oct 28 2011 Matthew Barnes <mbarnes@redhat.com> - 3.3.1-2
+- Fix detection of evolution-help (not using OMF files anymore).
+
+* Mon Oct 24 2011 Milan Crha <mcrha@redhat.com> - 3.3.1-1
+- Update to 3.3.1
+- Add patch to not call g_thread_init()
+
+* Mon Sep 26 2011 Milan Crha <mcrha@redhat.com> - 3.2.0-1
+- Update to 3.2.0
+- Manage properly schemas files for evolution-bogofilter/spamassassin
+
+* Mon Sep 19 2011 Milan Crha <mcrha@redhat.com> - 3.1.92-1
+- Update to 3.1.92
+
+* Mon Sep 05 2011 Milan Crha <mcrha@redhat.com> - 3.1.91-1
+- Update to 3.1.91
+
+* Mon Aug 29 2011 Milan Crha <mcrha@redhat.com> - 3.1.90-1
+- Update to 3.1.90
+
+* Mon Aug 15 2011 Milan Crha <mcrha@redhat.com> - 3.1.5-1
+- Update to 3.1.5
+
+* Sat Jul 23 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.4-1
+- Update to 3.1.4
+
+* Mon Jul 04 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.3-1
+- Update to 3.1.3
+- Remove patch for building against libgdata-0.9.0 (fixed upstream).
+
+* Wed Jun 15 2011 Milan Crha <mcrha@redhat.com> - 3.1.2-2
+- Rebuild against newer gnome-desktop3
+
+* Tue Jun 14 2011 Milan Crha <mcrha@redhat.com> - 3.1.2-1
+- Update to 3.1.2
+- Add patch by Philip Withnall to build against libgdata-0.9.0
+- Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)
+
+* Tue May 17 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-3
+- Keep libevolution-mail-settings.so* from the previous change,
+  it is still used by other parts of evolution.
+
+* Mon May 09 2011 Matthew Barnes <mbarnes@redhat.com> - 3.1.1-2
+- Drop the "Email Settings" capplet.
+
+* Mon May 09 2011 Milan Crha <mcrha@redhat.com> - 3.1.1-1
+- Update to 3.1.1
+- Drop groupwise plugin, as it was split out upstream
+
+* Mon Apr 04 2011 Milan Crha <mcrha@redhat.com> - 3.0.0-1
+- Update to 3.0.0
+
+* Mon Mar 21 2011 Milan Crha <mcrha@redhat.com> - 2.91.92-1
+- Update to 2.91.92
+
+* Mon Mar 14 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.91-3
+- Remove some unnecessary BuildRequires:
+  gtkimageview-devel: No release available for gtk3.
+  libgnomecanvas-devel: Evolution bundles its own libgnomecanvas now.
+
+* Fri Mar 11 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.91-2
+- Split off an evolution-NetworkManager subpackage containing the NM
+  integration module.  Users that choose to bypass NetworkManager can
+  uninstall this subpackage so Evolution doesn't insist it's offline.
+
+* Mon Mar 07 2011 Milan Crha <mcrha@redhat.com> - 2.91.91-1
+- Update to 2.91.91
+
+* Mon Feb 21 2011 Milan Crha <mcrha@redhat.com> - 2.91.90-1
+- Update to 2.91.90
+
+* Fri Feb 11 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.6.2-1
+- Update to 2.91.6.2
+- Fixes build breakage when using GTK+ 3.0.
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.91.6.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Tue Feb 08 2011 Matthew Barnes <mbarnes@redhat.com> - 2.91.6.1-2
+- Evolution uses gtk3 now; re-enable libnotify.
+
+* Wed Feb  2 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.6.1-1
+- Update to 2.91.6.1
+
+* Mon Jan 31 2011 Milan Crha <mcrha@redhat.com> - 2.91.6-1
+- Update to 2.91.6
+- Require gtk3
+- Remove patch for Red Hat bug #657254 (fixed upstream)
+
+* Fri Jan 21 2011 Dan Williams <dcbw@redhat.com> - 2.91.5-4
+- Fix crash at shutdown by finishing tasks before cleaning up (rh #657254)
+
+* Tue Jan 18 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.5-3
+- Rebuild against newer libgdata
+
+* Thu Jan 13 2011 Matthias Clasen <mclasen@redhat.com> - 2.91.5-2
+- Drop gnome-themes dependency
+
+* Mon Jan 10 2011 Milan Crha <mcrha@redhat.com> - 2.91.5-1
+- Update to 2.91.5
+
+* Mon Dec 20 2010 Milan Crha <mcrha@redhat.com> - 2.91.4-1
+- Update to 2.91.4
+
+* Mon Nov 29 2010 Milan Crha <mcrha@redhat.com> - 2.91.3-1
+- Update to 2.91.3
+- Remove patch for Red Hat bug #176400 (fixed upstream)
+
+* Mon Nov 08 2010 Milan Crha <mcrha@redhat.com> - 2.91.2-1
+- Update to 2.91.2
+
+* Fri Nov 05 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-3
+- Rebuild against newer libxml2
+- Disable libnotify, it's gtk3 only, but evolution is not
+
+* Wed Nov  3 2010 Matthias Clasen <mclasen@redhat.com> - 2.91.1-2
+- Rebuild against new libnotify
+
+* Mon Oct 18 2010 Milan Crha <mcrha@redhat.com> - 2.91.1-1
+- Update to 2.91.1
+
+* Mon Oct 11 2010 Milan Crha <mcrha@redhat.com> - 2.91.0-1
+- Update to 2.91.0
+- Remove patch for Gnome bug #626066 (fixed upstream)
+
+* Wed Sep 29 2010 jkeating - 2.31.92-3
+- Rebuilt for gcc bug 634757
+
+* Tue Sep 14 2010 Milan Crha <mcrha@redhat.com> - 2.31.92-2.fc15
+- Add patch for Gnome bug #626066 (login to NSS on demand)
+
+* Mon Sep 13 2010 Milan Crha <mcrha@redhat.com> - 2.31.92-1.fc15
+- Update to 2.31.92
+
+* Mon Aug 30 2010 Milan Crha <mcrha@redhat.com> - 2.31.91-1.fc14
+- Update to 2.31.91
+- Remove msgmerge calls due to a floating point exception there
+
+* Mon Aug 16 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.90-1.fc14
+- Update to 2.31.90
+
+* Fri Aug 06 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.6-2.fc14
+- Fix handling of migrated signature files.
+
+* Tue Aug 03 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.6-1.fc14
+- Update to 2.31.6
+- Drop dbus-glib requirement.
+- Bump glib2 requirement to 2.25.12.
+- Roll back evo_base_version to 2.32.
+- Add clutter-gtk requirement (for express mode).
+- Remove gtk-compat macro patch (fixed upstream).
+
+* Thu Jul 22 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.5-2.fc14
+- Add patch to fix startup crash in gtk-compat macros.
+
+* Tue Jul 13 2010 Milan Crha <mcrha@redhat.com> - 2.31.5-1.fc14
+- Update to 2.31.5
+- Remove 'conduit' (removed upstream)
+
+* Mon Jun 07 2010 Milan Crha <mcrha@redhat.com> - 2.31.3-1.fc14
+- Update to 2.31.3
+
+* Fri May 28 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.2-2.fc14
+- Evolution Express supercedes Anjal.
+- No need to undefine GNOME_DISABLE_DEPRECATED.
+- Remove nntp_support flag; that got moved to E-D-S ages ago.
+- Remove exchange_support flag; it's all in evolution-exchange now.
+
+* Mon May 24 2010 Milan Crha <mcrha@redhat.com> - 2.31.2-1.fc14
+- Update to 2.31.2
+- Bump gtkhtml3 requirement to 3.31.2
+
+* Fri May 07 2010 Matthew Barnes <mbarnes@redhat.com> - 2.31.1-2.fc14
+- Require yelp in evolution-help (RH bug #589555).
+- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
+  is not installed).
+
+* Mon May 03 2010 Milan Crha <mcrha@redhat.com> - 2.31.1-1.fc14
+- Update to 2.31.1
+
+* Tue Feb 09 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-2.fc13
+- Rebuild against evolution-data-server-2.29.90-3
+
+* Mon Feb 08 2010 Milan Crha <mcrha@redhat.com> - 2.29.90-1.fc13
+- Update to 2.29.90
+- Removed unneeded BuildRequires.
+
+* Fri Jan 29 2010 Matthew Barnes <mbarnes@redhat.com> - 2.29.6-2.fc13
+- Bump gtkhtml3 requirement to 3.29.6.
+
+* Mon Jan 25 2010 Milan Crha <mcrha@redhat.com> - 2.29.6-1.fc13
+- Update to 2.29.6
+- Remove patch for Gnome bug #606874 (fixed upstream).
+- Add rarian-compat to BuildRequires for Scrollkeeper.
+
+* Mon Jan 18 2010 Matthias Clasen <mclasen@redhat.com> - 2.29.5-2.fc13
+- Rebuild against new gnome-desktop
+
+* Tue Jan 12 2010 Milan Crha <mcrha@redhat.com> - 2.29.5-1.fc13
+- Update to 2.29.5
+- Add patch for Gnome bug #606874 (mktemp removed in glibc-2.11.90-8)
+
+* Tue Dec 22 2009 Matthew Barnes <mbarnes@redhat.com> - 2.29.4-2.fc13
+- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
+  (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)
+
+* Mon Dec 21 2009 Milan Crha <mcrha@redhat.com> - 2.29.4-1.fc13
+- Update to 2.29.4
+- Remove patch for missing m4 files from tarball (fixed upstream).
+
+* Mon Nov 30 2009 Milan Crha <mcrha@redhat.com> - 2.29.3-1.fc13
+- Update to 2.29.3
+- Add patch for missing m4 files from tarball.
+- Disable autoreconf call.
+
+* Tue Nov 17 2009 Matthew Barnes <mbarnes@redhat.com> - 2.29.2-1.fc13
+- Update to 2.29.2
+- Synchronize spec file with my kill-bonobo test package.
+
+* Tue Oct 27 2009 Matthew Barnes <mbarnes@redhat.com> - 2.29.1-1.fc13
+- Update to 2.29.1
+- Bump evo_major to 2.30.
+- Drop Bonobo + ORBit dependency (yay!).
+- Remove option to use OpenSSL instead of NSS.
+- Uninstall GConf schemas during %%pre and %%preun.
+
+* Mon Sep 21 2009 Milan Crha <mcrha@redhat.com> - 2.28.0-1.fc12
+- Update to 2.28.0
+
+* Mon Sep 07 2009 Milan Crha <mcrha@redhat.com> - 2.27.92-1.fc12
+- Update to 2.27.92
+
+* Mon Aug 24 2009 Milan Crha <mcrha@redhat.com> - 2.27.91-1.fc12
+- Update to 2.27.91
+- Remove patch for GNOME bug #591414 (fixed upstream).
+
+* Fri Aug 14 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.90-3.fc12
+- Add patch for GNOME bug #591414 (calendar library linked as module).
+
+* Tue Aug 11 2009 Milan Crha <mcrha@redhat.com> - 2.27.90-2.fc12
+- Build requires gnome-desktop-devel >= 2.26
+- New library libevolution-cal-shared.so
+
+* Mon Aug 10 2009 Milan Crha <mcrha@redhat.com> - 2.27.90-1.fc12
+- Update to 2.27.90
+
+* Tue Jul 28 2009 Milan Crha <mcrha@redhat.com> - 2.27.5-3.fc12
+- Enable pst-import plugin (RH bug #493049)
+
+* Tue Jul 28 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.5-2.fc12
+- Move libeconduit.so into the conduits subpackage to see if that
+  untangles us from gnome-pilot.
+
+* Mon Jul 27 2009 Milan Crha <mcrha@redhat.com> - 2.27.5-1.fc12
+- Update to 2.27.5
+- Remove pst import plugin patch (fixed upstream).
+- Remove work around deprecation of g_mount_unmount (fixed upstream).
+
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.27.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
+* Mon Jul 13 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.4-1.fc12
+- Update to 2.27.4
+- Work around deprecation of g_mount_unmount().
+
+* Fri Jul 10 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-5.fc11
+- Add an evolution-pst subpackage for the PST importer plugin.
+- Disabled until libpst settles on an API.
+
+* Thu Jul 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-4.fc12
+- Add BR for libpst-devel and libytnef-devel (RH bug #493049).
+- Add patch to build pst-import plugin against current libpst.
+- libpst's API broke again so disable the BR's for now.
+- Specify the gettext package when calling intltool-update.
+
+* Wed Jul 01 2009 Milan Crha <mcrha@redhat.com> - 2.27.3-3.fc12
+- Rebuild against newer gcc
+
+* Tue Jun 23 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-2.fc12
+- Add patch to allow Anjal to build.
+
+* Mon Jun 15 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.3-1.fc12
+- Update to 2.27.3
+
+* Sun Jun 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.27.2-2.fc12
+- Don't make -perl own directories that are already owned by the base package
+
+* Fri May 29 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.2-1.fc12
+- Update to 2.27.2
+- Patch broken libevolution-mail-shared library.
+- Remove strict_build_settings since the settings are used upstream now.
+
+* Mon May 04 2009 Matthew Barnes <mbarnes@redhat.com> - 2.27.1-1.fc12
+- Update to 2.27.1
+- Bump evo_major to 2.28.
+- Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652.
+
+* Mon Apr 27 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.1-2.fc11
+- Don't drop schemas translations from po files
+
+* Wed Apr 15 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.1.1-1.fc11
+- Update to 2.26.1.1
+- Remove patch for GNOME bug #578685 (fixed upstream).
+
+* Tue Apr 14 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.1-2.fc11
+- Add patch for GNOME bug #578685 (attachment bar crasher).
+
+* Mon Apr 13 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.1-1.fc11
+- Update to 2.26.1
+
+* Fri Apr 10 2009 Matthias Clasen <mclasen@redhat.com> - 2.26.0-3.fc11
+- Fix directory ownership
+
+* Thu Apr 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.0-2.fc11
+- Require libpst.
+
+* Mon Mar 16 2009 Matthew Barnes <mbarnes@redhat.com> - 2.26.0-1.fc11
+- Update to 2.26.0
+
+* Mon Mar 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.92-1.fc11
+- Update to 2.25.92
+
+* Tue Feb 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.25.91-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
+
+* Sun Feb 22 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.91-2.fc11
+- Actually make the help subpackage noarch
+
+* Mon Feb 16 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.91-1.fc11
+- Update to 2.25.91
+
+* Sat Feb 14 2009 Matthias Clasen <mclasen@redhat.com> - 2.25.90-3.fc11
+- Make the help subpackage noarch
+
+* Fri Feb 06 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-2.fc11
+- Update BuildRoot, License, Source and URL tags.
+- Require gnome-common so we don't have to patch it out.
+
+* Mon Feb 02 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.90-1.fc11
+- Update to 2.25.90
+
+* Mon Jan 19 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.5-1.fc11
+- Update to 2.25.5
+- Ditch eds_version and use our own version.  This will keep evolution
+  and evolution-data-server versions in lockstep from now on.
+
+* Mon Jan 05 2009 Matthew Barnes <mbarnes@redhat.com> - 2.25.4-1.fc11
+- Update to 2.25.4
+- Bump eds_version to 2.25.4.
+- Bump libgweather_version to 2.25.4.
+
+* Mon Dec 15 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.3.1-1.fc11
+- Update to 2.25.3.1
+- New BR: libgweather-devel
+- Remove patch for GNOME bug #552583 (fixed upstream).
+- Bump the gtkhtml and gtk2 minimum versions.
+
+* Tue Dec 09 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.2-2.fc11
+- Add patch for GNOME bug #552583 (fix account URI comparisons).
+
+* Mon Dec 01 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.2-1.fc11
+- Update to 2.25.2
+- Bump eds_version to 2.25.2.
+
+* Thu Nov 20 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.1-2.fc11
+- Fix a typo (RH bug #472358).
+
+* Mon Nov 03 2008 Matthew Barnes <mbarnes@redhat.com> - 2.25.1-1.fc11
+- Update to 2.25.1
+- Bump evo_major to 2.26.
+- Bump eds_version to 2.25.1.
+
+* Tue Oct 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.1-2.fc10
+- Bump eds_version to 2.24.1 (unfortunately).
+
+* Tue Oct 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.1-1.fc10
+- Update to 2.24.1
+
+* Wed Oct  8 2008 Matthias Clasen  <mclasen@redhat.com> - 2.24.0-3
+- Save space in the -help package by not shipping multiple copies
+  of each screenshot
+
+* Thu Sep 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.0-2.fc10
+- Strip unneeded translations from .mo files (RH bug #463887).
+- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).
+
+* Mon Sep 22 2008 Matthew Barnes <mbarnes@redhat.com> - 2.24.0-1.fc10
+- Update to 2.24.0
+
+* Mon Sep 08 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.92-1.fc10
+- Update to 2.23.92
+
+* Mon Sep 01 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.91-1.fc10
+- Update to 2.23.91
+- Bump eds_version to 2.23.91
+
+* Mon Aug 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.90-2.fc10
+- Bump gtkhtml_version to 3.23.5 (RH bug #460076).
+
+* Wed Aug 20 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.90-1.fc10
+- Update to 2.23.90
+- Bump eds_version to 2.23.90.1
+
+* Mon Aug 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.6-1.fc10
+- Update to 2.23.6
+
+* Tue Jul 22 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.5-1.fc10
+- Update to 2.23.5
+- Bump eds_version to 2.23.5.
+
+* Fri Jul 18 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 2.23.4-3.fc10
+- fix license tag
+- fix patches to apply with fuzz=0
+
+* Thu Jun 19 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.4-2.fc10
+- Don't ship the unfinished "Custom Header" plugin.
+
+* Mon Jun 16 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.4-1.fc10
+- Update to 2.23.4
+- Remove patches for RH bug #449925 (fixed upstream).
+
+* Fri Jun 06 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.3.1-4.fc10
+- Use a less pretentious summary.
+
+* Fri Jun 06 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.3.1-3.fc10
+- Remove the gnome-spell requirement.
+
+* Wed Jun 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.3.1-2.fc10
+- Add patches for RH bug #449925 (buffer overflow vulnerabilities).
+
+* Mon Jun 02 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.3.1-1.fc10
+- Update to 2.23.3.1
+- Bump eds_version to 2.23.3.
+
+* Mon May 12 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.2-1.fc10
+- Update to 2.23.2
+- Remove enchant-devel requirement.
+- Remove patch for RH bug #437208 (fixed upstream).
+
+* Mon Apr 28 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.1-2.fc10
+- Explicitly require enchant-devel, even though I shouldn't need to.
+
+* Mon Apr 21 2008 Matthew Barnes <mbarnes@redhat.com> - 2.23.1-1.fc10
+- Update to 2.23.1
+- Bump evo_major to 2.22.
+- Bump eds_version to 2.23.1.
+- Bump glib2_version to 2.16.0.
+- Bump gtkhtml_version to 3.19.1.
+- Add gvfs requirement.
+- Drop gnomevfs2 requirement.
+- Remove patch for RH bug #164957 (obsolete).
+
+* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
+- Update to 2.22.1
+- Remove patch for GNOME bug #524310 (fixed upstream).
+
+* Tue Mar 25 2008 Dan Williams <dcbw@redhat.com> - 2.22.0-4.fc9
+- Add patch for GNOME bug #524310
+
+* Fri Mar 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3.fc9
+- Explicit require evolution-data-server since its shared object names
+  still can't be trusted (RH bug #426511).
+
+* Fri Mar 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-2.fc9
+- Add patch for RH bug #437208 (tracking network status).
+
+* Mon Mar 10 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-1.fc9
+- Update to 2.22.0
+- Remove patch for CVE-2008-0072 (fixed upstream).
+
+* Tue Mar 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.92-2.fc9
+- Add patch for CVE-2008-0072 (format string vulnerability).
+
+* Mon Feb 25 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.92-1.fc9
+- Update to 2.21.92
+- Bump eds_version to 2.21.92.
+
+* Wed Feb 13 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.91-2.fc9
+- Rebuild against libsoup 2.3.2.
+
+* Mon Feb 11 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.91-1.fc9
+- Update to 2.21.91
+- Bump eds_version to 2.21.91.
+- Remove patch for GNOME bug #240073 (fixed upstream).
+
+* Sat Feb 02 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.90-4.fc9
+- Remove some obsolete configure options:
+  --enable-file-chooser, --enable-file-locking, --enable-dot-locking
+- Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream).
+- Remove patch for RH bug #215478 (fixed upstream).
+
+* Tue Jan 29 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.90-3.fc9
+- Add patch to address the recent deprecation of G_GNUC_FUNCTION.
+
+* Tue Jan 29 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.90-2.fc9
+- Add patch for GNOME bug #240073 (don't strikeout Click to Add in tasks).
+
+* Mon Jan 28 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.90-1.fc9
+- Update to 2.21.90
+- Update build requirements.
+- Remove patch for GNOME #363695 (obsolete/problematic).
+- Remove patch for GNOME #509741 (fixed upstream).
+
+* Tue Jan 15 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-2.fc9
+- Add patch for GNOME bug #509741 (crash on startup).
+
+* Mon Jan 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.5-1.fc9
+- Update to 2.21.5
+- The backup-restore plugin is stable again.
+- Remove patch for RH bug #154360 (fixed upstream).
+- Remove patch for RH bug #166231 (obsolete, possibly fixed upstream).
+- Remove patch for RH bug #178295 (fixed upstream).
+- Remove patch for GNOME bug #362638 (fixed upstream).
+- Remove patch for GNOME bug #504030 (fixed upstream).
+- Remove patch for GNOME bug #507311 (fixed upstream).
+
+* Sat Jan 05 2008 Matthew Barnes <mbarnes@redhat.com> - 2.21.4-2.fc9
+- Add patch for GNOME bug #507311 (send Bug Buddy reports to the new
+  BugBuddyBugs Bugzilla component).
+
+* Mon Dec 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.4-1.fc9
+- Update to 2.21.4
+- Expunge unused patches.
+- Bump eds_version to 2.21.4 for new Camel functions.
+
+* Mon Dec 10 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-4.fc9
+- Split junk filtering plugins into evolution-bogofilter and
+  evolution-spamassassin subpackages, each of which requires the
+  necessary backend packages.  (RH bug #377381)
+
+* Wed Dec 05 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-3.fc9
+- Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3.
+
+* Tue Dec  4 2007 Matthias Clasen <mclasen@redhat.com> - 2.21.3-2
+- Rebuild against new openssl
+
+* Mon Dec 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.3-1.fc9
+- Update to 2.21.3
+- Remove patch for RH bug #215467 (fixed upstream).
+- Remove patch for GNOME bug #499920 (fixed upstream).
+
+* Sat Dec 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-4.fc9
+- Fix a corrupted patch that caused GNOME bug #499291.
+
+* Thu Nov 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-3.fc9
+- Add patch for GNOME bug #499920 (invalid #include).
+
+* Fri Nov 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-2.fc9
+- Rebuild against newer libpisync.so.
+
+* Mon Nov 12 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.2-1.fc9
+- Update to 2.21.2
+
+* Tue Oct 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.1-2.fc9
+- Attempt to split the gnome-pilot stuff into a separate
+  evolution-conduits subpackage (RH bug #178155).
+
+* Mon Oct 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.21.1-1.fc9
+- Update to 2.21.1
+- Remove redundant requirements.
+- Bump EDS requirement to 2.21.1.
+- Bump gtkhtml requirement to 3.17.1.
+- Backup/restore plugin got moved from standard to experimental.
+- Revert the per-component menu items (RH bug #222105, #241462, #293771).
+- Show the switcher buttons by default (RH bug #186403).
+- Alter the desktop file Name and Comment.
+- Disable patch for GNOME bug #376991 for now.  It may be contributing
+  to password prompting problems as described in RH bug #296671.
+- Remove patch for GNOME bug #417999 (fixed upstream).
+- Remove patch for GNOME bug #476040 (fixed upstream).
+- Remove patch for GNOME bug #477045 (fixed upstream).
+
+* Mon Oct 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.1-2.fc8
+- Fix a broken zoom icon.
+
+* Mon Oct 15 2007 Milan Crha <mcrha@redhat.com> - 2.12.1-1.fc8
+- Update to 2.12.1
+- Add files for the new backup-restore plugin.
+
+* Tue Oct 09 2007 Matthew Barnes <mbarnes@redhat.com. - 2.12.0-8.fc8
+- Sync version requirements up with configure.in.
+
+* Tue Oct 09 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-7.fc8
+- Revise patch for GNOME bug #477045 (more icon tweaks).
+
+* Fri Oct 05 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-6.fc8
+- Require libbonobo >= 2.16.0 (RH bug #213823).
+
+* Thu Oct 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-5.fc8
+- Require gnome-themes (RH bug #235617).
+
+* Wed Oct 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-4.fc8
+- Revise patch for GNOME bug #477045 (run-time warnings when composing mail).
+
+* Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-3.fc8
+- Re-enable the inline audio plugin since it now uses GStreamer 0.10.
+
+* Wed Sep 19 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-2.fc8
+- Revise patch for GNOME bug #477045 (less-zealous icon renaming).
+
+* Mon Sep 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.12.0-1.fc8
+- Update to 2.12.0
+- Remove patch for RH bug #182247 (fixed upstream).
+
+* Sat Sep 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.92-4.fc8
+- Add patch for GNOME bug #477045 (use standard icon names).
+
+* Tue Sep 11 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.92-3.fc8
+- Add patch for GNOME bug #476040 (fix attachment icon).
+
+* Sat Sep  8 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.92-2.fc8
+- Split off an evolution-help package
+
+* Mon Sep 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.92-1.fc8
+- Update to 2.11.92
+
+* Wed Aug 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.91-3.fc8
+- Revise patch for GNOME bug #362638 to fix GNOME bug #357175
+  (Evolution fails to close after IMAP alert has been displayed).
+
+* Tue Aug 28 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.91-2.fc8
+- Fix compilation breakage caused by our strict build settings.
+
+* Tue Aug 28 2007 Milan Crha <mcrha@redhat.com> - 2.11.91-1.fc8
+- Update to 2.11.91
+- Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream).
+- Removed patch for RH bug #157505 / GNOME bug #303878 (fixed upstream).
+- Removed patch for RH bug #161885 / GNOME bug #309166 (fixed upstream).
+- Removed patch for RH bug #202751 / GNOME bug #355766 (fixed upstream).
+- Removed patch for RH bug #218898 / GNOME bug #385414 (fixed upstream).
+- Removed patch for RH bug #253348 / GNOME bug #467883 (fixed upstream).
+
+* Thu Aug 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-4.fc8
+- Obsolete the evolution-bogofilter package.
+
+* Mon Aug 20 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-3.fc8
+- Revise patch for GNOME bug #417999 to fix GNOME bug #447591
+  (Automatic Contacts combo boxes don't work).
+
+* Sat Aug 18 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-2.fc8
+- Add patch for RH bug #253348 (crash on startup).
+
+* Wed Aug 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.90-1.fc8
+- Update to 2.11.90
+
+* Wed Aug  8 2007 Matthias Clasen <mclasen@redhat.com> - 2.11.6.1-2
+- Update the license field
+- Use %%find_lang for help files
+
+* Wed Aug 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.6.1-1.fc8
+- Update to 2.11.6.1
+
+* Tue Jul 31 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.6-1.fc8
+- Update to 2.11.6
+- Remove patch for GNOME bug #380534 (fixed upstream).
+
+* Fri Jul 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.5-3.fc8
+- Add patch for GNOME bug #380534 (clarify version requirements).
+
+* Mon Jul 16 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.5-2.fc8
+- Remove spamassassin requirement since it's optional.
+
+* Fri Jul 13 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.5-1.fc8
+- Update to 2.11.5
+- Revise patch for GNOME bug #362638 to fix RH bug #245695.
+
+* Wed Jun 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.4-2.fc8
+- Revise patch for GNOME bug #363638 to fix RH bug #245289 (frequent hangs).
+
+* Mon Jun 18 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.4-1.fc8
+- Update to 2.11.4
+- Remove patch for GNOME bug #447727 (fixed upstream).
+
+* Thu Jun 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-5.fc8
+- Add patch for GNOME bug #447727 (remove EClippedLabel).
+
+* Wed Jun 06 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-4.fc8
+- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit).
+
+* Wed Jun 06 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-3.fc8
+- Remove some debug messages that accidentally slipped in.
+
+* Tue Jun 05 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-2.fc8
+- Fix an invalid g_free() that was causing lock-ups.
+
+* Mon Jun 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.3-1.fc8
+- Update to 2.11.3
+- Evolution no longer has versioned file names.
+- Remove patch for RH bug #202289 (fixed upstream).
+- Remove patch for RH bug #235878 (fixed upstream).
+- Remove patch for RH bug #238155 (fixed upstream).
+- Remove patch for RH bug #240147 (fixed upstream).
+
+* Thu May 31 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.2-2.fc8
+- Evolution no longer requires libgnomeprint[ui].
+
+* Fri May 18 2007 Matthew Barnes <mbarnes@redhat.com> - 2.11.2-1.fc8
+- Update to 2.11.2
+- Bump evo_major to 2.12.
+- Bump eds_version to 1.11.0.
+- Update files with new plugins and icons.
+- Remove patch for RH bug #190359 (fixed upstream).
+- Remove patch for RH bug #218801 (fixed upstream).
+- Remove patch for RH bug #234315 (fixed upstream).
+- Remove patch for RH bug #236399 (fixed upstream).
+- Remove patch for RH bug #236860 (fixed upstream).
+- Remove patch for RH bug #238551 (fixed upstream).
+- Remove patch for GNOME bug #373837 (fixed upstream).
+- Remove patch for GNOME bug #373116 (fixed upstream).
+- Remove patch for GNOME bug #418971 (fixed upstream).
+- Remove patch for GNOME bug #419469 (fixed upstream).
+- Remove patch for GNOME bug #419524 (fixed upstream).
+- Remove evolution-2.6.0-prototypes.patch (obsolete).
+
+* Wed May 16 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-17.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #237206
+  (certificate prompt causes crash, again).
+
+* Tue May 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-16.fc7
+- Add patch for RH bug #240147 (Send/Receive dialog layout).
+
+* Mon May 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-15.fc7
+- Revise patch for RH bug #236860 to match upstream's solution.
+
+* Mon May 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-14.fc7
+- Revise patch for RH bug #238155 (crash on startup).
+
+* Mon May 07 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-13.fc7
+- Add patch for RH bug #238155 (crash on startup).
+
+* Tue May 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-12.fc7
+- Add patch for RH bug #238551 (incorrect attachment count).
+
+* Tue May 01 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-10.fc7
+- Revise patch for GNOME bug #363695 to fix RH bug #238497
+  (crash sorting "To" column).
+
+* Mon Apr 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-9.fc7
+- Revise some patches so that we don't have to run autoreconf.
+- Remove patch for GNOME bug #427939 (use a different work-around).
+
+* Fri Apr 27 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-8.fc7
+- Add patch for RH bug #236399 (en_CA attribution format).
+
+* Mon Apr 23 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-7.fc7
+- Remove the welcome email from evolution@novell.com (bug #179427).
+
+* Sun Apr 22 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-6.fc7
+- Add patch for RH bug #236860 (launching from clock applet).
+
+* Sat Apr 21 2007 Matthias Clasen <mclasen@redhat.com> - 2.10.1-5
+- Don't install INSTALL
+
+* Sat Apr 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-4.fc7
+- Add patch for RH bug #234315 (fix saving attachments).
+
+* Fri Apr 13 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-3.fc7
+- Add patch for RH bug #235878 (make Help->Contents work again).
+
+* Tue Apr 10 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-2.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #235096
+  (crash when displaying a mail server message to user).
+
+* Mon Apr 09 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.1-1.fc7
+- Update to 2.10.1
+- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
+- Remove patch for CVE-2007-1002 (fixed upstream).
+- Remove patch for RH bug #231767 (fixed upstream).
+- Remove patch for RH bug #235056 (fixed upstream).
+- Remove patch for GNOME bug #352713 (fixed upstream).
+
+* Wed Apr 04 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-10.fc7
+- Add patch for GNOME bug #352713 (improve folder tree updates).
+
+* Tue Apr 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-9.fc7
+- Require libxml2-devel in evolution-devel package (RH bug #235056).
+- Add libxml-2.0 requirement to evolution-plugin-2.10.pc.
+
+* Tue Apr 03 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-8.fc7
+- Revise patch for GNOME bug #419524 to fix RH bug #235082
+  (crash in initial account setup wizard).
+
+* Mon Apr 02 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-7.fc7
+- Add patch for RH bug #231767 (allow mail-notification to build).
+
+* Fri Mar 30 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-6.fc7
+- Revise patch for GNOME bug #362638 (deprecate EThread).
+
+* Thu Mar 29 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-5.fc7
+- CVE-2007-1002 (Shared memo categories format string vulnerability)
+- Add -Wdeclaration-after-statement to strict build settings.
+
+* Mon Mar 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-4.fc7
+- Run gtk-update-icon-cache in %%post and %%postun (RH bug #234018).
+
+* Sat Mar 17 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-3.fc7
+- Add flag to disable deprecated Camel symbols.
+- Add patch for GNOME bug #419469 (refactor shell/main.c).
+- Add patch for GNOME bug #419524 (use GLib's i18n macros).
+- Add patch for GNOME bug #418971 (drop support for GLib < 2.8).
+
+* Wed Mar 14 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-2.fc7
+- Add patch for GNOME bug #417999 (use ESourceComboBox).
+
+* Mon Mar 12 2007 Matthew Barnes <mbarnes@redhat.com> - 2.10.0-1.fc7
+- Update to 2.10.0.
+- Add patch for GNOME bug #376991 (refactor password handling).
+
+* Mon Feb 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.92-1.fc7
+- Update to 2.9.92.
+- Require gtkhtml3 >= 3.13.92.
+- Add missing libgnomeprintui22 requirements.
+- Remove patch for GNOME bug #350253 (fixed upstream).
+- Remove patch for GNOME bug #356177 (fixed upstream).
+- Remove patch for GNOME bug #360946 (fixed upstream).
+- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream).
+- Add minimum version to intltool requirement (currently >= 0.35.5).
+
+* Thu Feb 15 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.91-3.fc7
+- Revise patch for GNOME bug #362638 to fix RH bug #220714
+  (certificate prompt causes crash).
+
+* Tue Feb 13 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.91-2.fc7
+- Require GConf2 in post.
+- Require scrollkeeper in post and postun.
+
+* Mon Feb 12 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.91-1.fc7
+- Update to 2.9.91
+- Require gtkhtml3 >= 3.13.6.
+- Add files for new imap-features plugin.
+- Add flag to disable deprecated Pango symbols.
+- Remove patch for GNOME bug #357216 (fixed upstream).
+- Remove patch for GNOME bug #359979 (fixed upstream).
+
+* Fri Jan 26 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.5-4.fc7
+- Compile with the -fno-strict-aliasing flag, which will hopefully improve
+  reliability until the illegal type-punning is fixed (RH bug #224552).
+
+* Sun Jan 21 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.5-3.fc7
+- Revise evolution-2.7.1-no-gnome-common.patch so that we no longer
+  have to run autoconf before building.
+- Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer
+  have to run automake before building.
+
+* Wed Jan 10 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.5-2.fc7
+- Add patch for GNOME bug #359979 (change EMsgPort semantics).
+
+* Mon Jan 08 2007 Matthew Barnes <mbarnes@redhat.com> - 2.9.5-1.fc7
+- Update to 2.9.5
+- Remove pilot-link-0.12 patch (fixed upstream).
+- Remove patch for RH bug #215466 and #218589 (fixed upstream).
+- Remove patch for RH bug #215695 (fixed upstream).
+
+* Sat Dec 30 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-4.fc7
+- Add Requires evolution-data-server-devel to devel subpackage
+  (RH bug #218889).
+
+* Thu Dec 21 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-3.fc7
+- Add patch for RH bug #218898 (viewing message source).
+
+* Wed Dec 20 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-2.fc7
+- Revise patch for RH bug #202751 (printing of indic languages).
+
+* Tue Dec 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-1.fc7
+- Update to 2.9.4
+- Bump eds_version to 1.9.4 due to soname changes.
+- Remove patch for GNOME bug #382431 (fixed upstream).
+
+* Fri Dec 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-5.fc7
+- Add patch for GNOME bug #373116 (use GtkColorButton).
+
+* Fri Dec 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-4.fc7
+- Disable patch for RH bug #216537, which caused RH bug #219228.
+
+* Tue Dec 12 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-3.fc7
+- Revise patch for RH bug #215466 to also fix RH bug #218589.
+
+* Mon Dec 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-2.fc7
+- Add patch for RH bug #215467 (missing meeting participants).
+
+* Sat Dec 09 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.3-1.fc7
+- Update to 2.9.3
+- Configure with scrollkeeper disabled.
+- Disable automake portability checking.
+- Ship our own icons from gnome-icon-theme.
+- BuildRequires: gnome-doc-utils >= 0.8.0
+- Add patch for RH bug #215478 (Maildir and MH accounts).
+- Add patch for RH bug #215695 (crashes w/o mail accounts).
+- Add patch for RH bug #216537 (viewing attachments).
+- Add patch for RH bug #218801 (count unread messages first).
+- Add patch for GNOME bug #350253 (ship our own icons).
+- Add patch for GNOME bug #382431 (implicit function declaration).
+- Revise patch for GNOME bug #360946 (improved "about" dialog).
+- Remove patch for GNOME bug #357970 (fixed upstream).
+
+* Tue Nov 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-3.fc7
+- Add patch to port evolution conduits to pilot-link 0.12.
+- Add patch for RH bug #215466 (optional meeting participants).
+- Add patch for GNOME bug #373837 (use GtkFontButton).
+- Remove patch for GNOME bug #343331 (fixed upstream).
+
+* Tue Nov 07 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-2.fc7
+- Revise patch for RH bug #202751 and re-enable it.
+
+* Mon Nov 06 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.2-1.fc7
+- Update to 2.9.2
+- Remove patch for Gnome.org bug #360240 (fixed upstream).
+- Remove patch for Gnome.org bug #360619 (fixed upstream).
+
+* Mon Nov 06 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.1-3.fc7
+- Add patch for RH bug #176400 (reset calendar IM context).
+- Add patch for RH bug #182247 (calendar input glitch).
+
+* Fri Oct 20 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.1-2.fc7
+- Add patch for Gnome.org bug #356177 (deprecate EMutex).
+- Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv).
+- Disable patch for RH bug #202751 (unwanted side-effects).
+
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.1-1.fc7
+- Update to 2.9.1
+- Bump eds_version to 1.9.1, evo_major to 2.10.
+- Remove patch for Gnome.org bug #359236 (fixed upstream).
+
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.1-4.fc7
+- Another typo.
+
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.1-3.fc7
+- Fix a typo in setting up .desktop symlinks.
+
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.1-2.fc7
+- Forgot to check-in one of the patches.
+
+* Mon Oct 16 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.1-1.fc7
+- Update to 2.8.1
+- Use stricter build settings.
+- Make .desktop symlinks absolute (RH bug #209322).
+- Add patch for RH bug #202751 (printing of indic languages).
+- Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols).
+- Add patch for Gnome.org bug #359236 (search state crash).
+- Add patch for Gnome.org bug #360240 ("unused variable" warnings).
+- Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings).
+- Add patch for Gnome.org bug #360946 (improved "about" dialog).
+- Add patch for Gnome.org bug #362638 (deprecate EThread).
+- Update patch for RH bug #211058 (partially fixed upstream).
+- Remove patch for RH bug #201307 (fixed upstream).
+- Remove patch for RH bug #205576 (fixed upstream).
+- Remove patch for Gnome.org bug #351332 (fixed upstream).
+- Remove patch for Gnome.org bug #352450 (fixed upstream).
+- Remove patch for Gnome.org bug #353472 (fixed upstream).
+- Remove patch for Gnome.org bug #356811 (fixed upstream).
+
+* Sun Oct 01 2006 Jesse Keating <jkeating@redhat.com> - 2.8.0-7.fc6
+- rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Thu Sep 21 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-6.fc6
+- Add patch for RH bug #205576 (message deletion in thread view).
+
+* Wed Sep 20 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-5.fc6
+- Add patch for Gnome.org bug #356811 (lingering file on uninstall).
+
+* Tue Sep 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-4.fc6
+- Bump eds_version to 1.8.0.
+
+* Wed Sep 13 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-3.fc6
+- Add patch for RH bug #161885.
+
+* Wed Sep 13 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-2.fc6
+- Add patch for RH bug #201307.
+
+* Mon Sep  4 2006 Matthew Barnes <mbarnes@redhat.com> - 2.8.0-1.fc6
+- Update to 2.8.0
+- Remove patch for RH bug #197868 (fixed upstream).
+- Remove patch for RH bug #201541 (fixed upstream).
+- Remove patch for RH bug #201831 (fixed upstream).
+- Remove patch for RH bug #202383 (fixed upstream).
+- Remove patch for RH bug #203036 (fixed upstream).
+- Remove patch for Gnome.org bug #352248 (fixed upstream).
+- Remove patch for Gnome.org bug #352423 (fixed upstream).
+- Update patch for Gnome.org bug #351332 (partially fixed upstream).
+
+* Thu Aug 31 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-8.fc6
+- Add patch for RH bug #203036.
+- Disable notification-cleanups patch.
+
+* Tue Aug 29 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-7.fc6
+- Add patch for Gnome.org bug #353472.
+
+* Mon Aug 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-6.fc6
+- Add another hunk to the patch for RH bug #201541.
+- Add patch for RH bug #202289.
+
+* Mon Aug 28 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-5.fc6
+- Add patch for RH bug #201541.
+
+* Wed Aug 23 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-4.fc6
+- Add patches for Gnome.org bug #352450.
+
+* Tue Aug 22 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-3.fc6
+- Replace my patch for RH bug #202383 with a better one from upstream.
+- Add patch for Gnome.org bug #352423.
+
+* Mon Aug 21 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-2.fc6
+- Add patch for Gnome.org bug #352248 (and remember to commit it).
+
+* Mon Aug 21 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.92-1.fc6
+- Update to 2.7.92
+- Remove patch for RH bug #197834 (fixed upstream).
+- Update patch for Gnome.org bug #351332 (partially fixed upstream).
+
+* Tue Aug 15 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-5.fc6
+- Drop the bug-buddy dependency since it's not required for Evolution to run.
+
+* Mon Aug 14 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-4
+- Add patch for RH bug #201831.
+
+* Mon Aug 14 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-3
+- Consolidate "missing declarations" patches.
+- Add patch for RH bug #202383.
+
+* Fri Aug 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-2
+- Add patch for RH bug #197868.
+
+* Mon Aug  7 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.91-1
+- Update to 2.7.91
+- Update patch for RH bug #197834 for use with bug-buddy 2.15.90.
+- Require bug-buddy >= 2.15.90.
+
+* Fri Aug  4 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.90-6
+- Update to 2.7.90
+- Require evolution-data-server-1.7.90.1.
+
+* Wed Aug  2 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-5
+- Remove patch for RH bug #167157, as it fixed it the wrong way.
+- The real fix for #167157 is in evolution-data-server-1.7.4-5.
+- No longer packaging unused patches.
+
+* Mon Jul 31 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-4
+- Add patch for RH bug #178295.
+- Add patch for RH bug #167157.
+
+* Tue Jul 18 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-3
+- Clean up spec file, renumber patches.
+- Add BuildRequires for dbus-glib-devel.
+- Rebuild to pick up new D-Bus.
+
+* Thu Jul 13 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-2
+- Update patch for RH bug #157400.
+- Update patch for RH bug #157505.
+
+* Wed Jul 12 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.4-1
+- Update to 2.7.4
+- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
+- Remove patch for Gnome.org bug #345677 (fixed upstream).
+- Remove patch for RH bug #175596 (fixed upstream).
+
+* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 2.7.3-10.1
+- rebuild
+
+* Tue Jul 11 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-10
+- Update patch for RH bug #190359.
+
+* Fri Jul  7 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-9
+- Make "Submit Bug Report" menu item work again (RH #197384).
+
+* Thu Jul  6 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-8
+- Add patch for RH bug #166231 (also addresses #131227 and #157391).
+
+* Thu Jun 29 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-7
+- Add patch for RH bug #157400, reorder some patch #'s.
+
+* Thu Jun 29 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-6
+- Properly capitalize "Message->Mailing List" menu items (RH #175596).
+
+* Tue Jun 27 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-5
+- Add patch for Gnome.org bug #211058 for Trever Adams to test.
+
+* Mon Jun 26 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-4
+- Add patch for RH bug #157505 for QE testing.
+
+* Thu Jun 22 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.3-3
+- Fix bad type in schema file (Gnome.org #345677).
+
+* Wed Jun 14 2006 Tomas Mraz <tmraz@redhat.com> - 2.7.3-2
+- rebuilt with new gnutls
+
+* Tue Jun 13 2006 Matthias Clasen  <mclasen@redhat.com> - 2.7.3-1
+- Update to 2.7.3
+
+* Mon May 29 2006 Dan Williams <dcbw@redhat.com> - 2.7.2.1-4
+- Don't crash on quit when trying to save window size (Gnome.org #343331)
+
+* Tue May 23 2006 Matthew Barnes <mbarnes@redhat.com> 2.7.2.1-3
+- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API.
+- Require libnotify >= 0.4.
+
+* Fri May 19 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-2
+- Require specific versions of GNU Autotools packages for building.
+- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain).
+- Various spec file cleanups.
+- Pick up new libnotify.
+
+* Wed May 17 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.2.1-1
+- Update to 2.7.2.1
+- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch
+  (fixed upstream).
+
+* Fri May 12 2006 Matthew Barnes <mbarnes@redhat.com> - 2.7.1-1
+- Update to 2.7.1
+- Bump evo_major from 2.6 to 2.8
+- Upstream evolution.desktop renamed evolution-%%{evo_major}.desktop.
+- Upstream evolution.keys renamed evolution-%%{evo_major}.keys.
+- Upstream evolution.mime renamed evolution-%%{evo_major}.mime.
+- Update line numbers in evolution-2.5.2-no-gnome-common.patch and
+  evolution-2.5.5.1-notification-cleanups.patch and rename them to
+  version 2.7.1.
+
+* Wed May  3 2006 Matthew Barnes <mbarnes@redhat.com> - 2.6.1-3
+- rebuilt
+
+* Mon Apr 10 2006 Matthias Clasen <mclasen@redhat.com> - 2.6.1-2
+- Update to 2.6.1
+
+* Thu Mar 30 2006 Caolan McNamara <caolanm@redhat.com> - 2.6.0-2
+- rebuild against reverted pilot-link
+- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8
+
+* Mon Mar 13 2006 Ray Strode <rstrode@redhat.com> - 2.6.0-1
+- 2.6.0
+- turn on the "error on missing prototypes" check thing
+
+* Mon Feb 27 2006 Ray Strode <rstrode@redhat.com> - 2.5.92-1
+- 2.5.92
+
+* Tue Feb 14 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.91-1
+- 2.5.91
+- updated patch 101 to track upstream changes to calendar printing code
+- remove uptreamed patch 807 (NM multiple initialization assertion)
+- readded the mail-to-task plugin XML UI file
+- bump e-d-s req to 1.5.91
+
+* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 2.5.90-2.1
+- bump again for double-long bug on ppc(64)
+
+* Thu Feb  9 2006 Christopher Aillon <caillon@redhat.com> - 2.5.90-2
+- Disable the inline audio plugin for now since it uses gstreamer08
+
+* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 2.5.90-1.1
+- rebuilt for new gcc4.1 snapshot and glibc changes
+
+* Mon Jan 30 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.90-1
+- 2.5.90
+- trimmed patches 805 and 808, as parts of these got merged upstream
+- trimmed and regenerated patch 806 to track upstream
+- removed the mail-to-task plugin XML UI file
+
+* Sat Jan 28 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.5.1-2
+- added missing patch
+
+* 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 
+  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 
+  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 
+  -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. 
+- 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
+- fix fix for multilib issue with shlib bonobo components (bug 156982)
+
+* Wed Jan 18 2006 Ray Strode <rstrode@redhat.com> - 2.5.4-9
+- 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, 
+  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, 
+  #177670)
+
+* Thu Jan 12 2006 Christopher Aillon <caillon@redhat.com> - 2.5.4-6
+- Remove unneeded Requires: notify-daemon
+
+* Thu Jan 12 2006 Christopher Aillon <caillon@redhat.com> - 2.5.4-5
+- Update BR to libnotify-devel
+
+* Wed Jan 11 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-4
+- ported alarm notification code to the new libnotify API (patch 806, #177546)
+- added libnotify_support macro
+- added explicit notify-daemon requirement as a workaround for bug #177535
+
+* 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 
+  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
+
+* Wed Jan  4 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-2
+- added optional build-time requirement on NetworkManager-glib-devel
+- update patch 805 to cover a missing declaration in Network Manager support
+
+* Tue Jan  3 2006 David Malcolm <dmalcolm@redhat.com> - 2.5.4-1
+- 2.5.4
+- update patch 107 to track underlying code changes; rename from
+  evolution-2.2.2-move-autosave-file.patch to
+  evolution-2.5.4-move-autosave-file.patch
+- added patch to fix more missing declarations (patch 805)
+- added files for publish-calendar plugin
+
+* Mon Dec 19 2005 David Malcolm <dmalcolm@redhat.com> - 2.5.3-1
+- 2.5.3
+- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it
+  still applies cleanly
+
+* Thu Dec 15 2005 Christopher Aillon <caillon@redhat.com> 2.5.2-2
+- Require nspr and nss instead of mozilla-nspr and mozilla-nss
+- Update no-gnome-common patch to work with standalone nss package
+
+* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
+- rebuilt
+
+* Wed Dec  7 2005 David Malcolm <dmalcolm@redhat.com> - 2.5.2-1
+- 2.5.2
+- bump gtkhtml requirement from 3.7.6 to 3.9.2
+- bump eds requirement from 1.4.1.1 to 1.5.2
+- 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 
+  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 
+  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 
+  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 
+  change)
+
+* Tue Nov 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.2-1
+- 2.4.2
+- explicitly list the plugins that are packaged (#166234)
+- added build-time requirement on gstreamer-devel to cope with audio-inline
+  plugin
+
+* Tue Nov 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-8
+- add -DLDAP_DEPRECATED to CFLAGS (#172999)
+
+* Wed Oct 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-7
+- Added a patch (110) to hide the component switcher buttons by default on new
+  windows (#170799) by patching the GConf schema.
+- Made list of installed schemas explicit.
+- Own the plugins subdirectory
+
+* Tue Oct 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-6
+- use 4 separate .desktop files from the redhat-menus package, rather than the
+  current single one; bump the redhat-menus requirement accordingly (from 1.13
+  to 5.0.4); introduce a macro for this requirement.
+
+* Mon Oct 24 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-5
+- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and
+  continued to be broken with 2.3/2.4) (#103826, again)
+
+* Tue Oct 18 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-4
+- updated patch 804 to declare e_calendar_table_process_completed_tasks
+
+* Tue Oct 18 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-3
+- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix
+  missing declaration (thanks to Peter Robinson)
+
+* Mon Oct 17 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-2
+- bump e-d-s requirement to 1.4.1.1
+
+* Tue Oct  4 2005 David Malcolm <dmalcolm@redhat.com> - 2.4.1-1
+- 2.4.1
+- 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
+- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball
+
+* Wed Sep 14 2005 Jeremy Katz <katzj@redhat.com> - 2.4.0-2
+- rebuild for mozilla on ppc64
+
+* 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 
+  2.3.8-1) as this is now upstream.
+
+* Thu Sep  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-4
+- Enable exchange support when configuring, so that the exchange-operations
+  plugin gets built.
+
+* Fri Aug 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-3
+- Added patch for #157074 (patch 804)
+
+* Fri Aug 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.8-2
+- Move -Werror-implicit-function-declaration from configuration to the make
+  stage, to avoid breaking configuration tests.
+
+* 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 
+  problems arising (patch 110)
+
+* Tue Aug 16 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-3
+- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13
+- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1);
+  based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2
+
+* Mon Aug 15 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-2
+- rebuild
+
+* Tue Aug  9 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.7-1
+- 2.3.7
+- Bump evolution-data-server requirement from 1.3.6 to 1.3.7
+- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6
+
+* Mon Aug  8 2005 Tomas Mraz <tmraz@redhat.com> - 2.3.6.1-5
+- 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 
+  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 
+  apps-evolution-mail-prompts-checkdefault-2.4.schemas
+
+* Fri Jul 29 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.6.1-1
+- 2.3.6.1
+
+* 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 
+  CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
+- 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
+- added experimental patch to port ETable printing to use Pango (#150458)
+
+* Mon Jul 25 2005 David Malcolm <dmalcolm@redhat.com> - 2.3.5.1-1
+- 2.3.5.1
+- Update evo_major from 2.2 to 2.4
+- Updated evo-calendar-print-with-pango- patch from version 4 to 5
+- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in
+  in this branch tests for existance for dbus-glib-1, rather than max-version.
+- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as
+  this is now in upstream tarball.
+- Removed evolution-calendar-importers and evolution-addressbook-importers
+  directories.
+- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename
+  mozilla-nspr to nspr
+
+* Tue Jun 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-11.fc5
+- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)
+
+* Tue Jun 28 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-10.fc5
+- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802)
+
+* Mon Jun 27 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-9.fc5
+- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817)
+- Added Mark G Adams's memory leak fix (patch 801)
+
+* Mon Jun  6 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-8
+- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution
+  directory
+
+* Thu May 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-7
+- Added Akira Tagoh's patch for calendar keypress handling (#154360)
+
+* Mon May 23 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-6
+- Remove static versions of libraries
+
+* Thu May  5 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-5
+- 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 
+the path to the NSS/NSPR headers.
+- 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, 
+and run autoconf at the start of the build) (#156328)
+
+* Sat Apr 30 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-3
+- updated mozilla_build_version to 1.7.7
+
+* Sat Apr 30 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-2
+- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172)
+
+* Mon Apr 11 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.2-1
+- 2.2.2
+- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
+- removed patch for XB73912; now in upstream tarball
+- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
+- removed patch for XB73844; now in upstream tarball
+- Update requirements:
+  - gtkhtml3 from 3.6.1 to 3.6.2
+  - libgal2 from 2.4.1 to 2.4.2
+  - eds from 1.2.1 to 1.2.2
+
+* Wed Mar 23 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.1.1-2
+- Add patch for upstream bug XB73844 (should now be able to accept meeting requests)
+
+* Fri Mar 18 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.1.1-1
+- 2.1.1.1
+
+* Thu Mar 17 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.1-1
+- 2.2.1
+- Updated requirements:
+  * gtkhtml3 from 3.6.0 to 3.6.1
+  * libgal2 from 2.4.0 to 2.4.1
+  * eds from 1.2.0 to 1.2.1
+- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4
+- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change)
+
+* Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-10
+- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12
+
+* Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-9
+- another attempt at porting to pilot-link 0.12
+
+* Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-8
+- Added patch to deal with changes to pilot-link from 0.11->0.12
+
+* Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-7
+- use 0.31 rather than 0.31.0 for DBus version
+
+* Mon Mar 14 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-6
+- rebuilt against pilot-link-0.12
+- added versioning to the requirement on dbus (>=0.31)
+
+* Thu Mar 10 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-5
+- Added patch for changes to DBus API in version 0.31 (#150671)
+- Removed explicit run-time spec-file requirement on mozilla.
+  The Mozilla NSS API/ABI stabilised by version 1.7.3
+  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; 
+  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)
+- Introduced mozilla_build_version, to replace mozilla_version
+
+* Wed Mar  9 2005 Christopher Aillon <caillon@redhat.com> - 2.2.0-4
+- Depend on mozilla 1.7.6
+
+* Wed Mar  9 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-3
+- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items
+
+* Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-2
+- actually add source tarball this time
+
+* Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 2.2.0-1
+- 2.2.0
+- Removed patch for GCC 4 fix as this is now in upstream tarball
+- Updated requirements:
+  * gtkhtml3 from 3.5.7 to 3.6.0
+  * libgal2 from 2.3.5 to 2.4.0
+  * eds from 1.1.6 to 1.2.0
+
+* Tue Mar  8 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-3
+- rebuild (to use latest DBus library)
+
+* Tue Mar  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-2
+- added patch to fix build with GCC4
+
+* Tue Mar  1 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.6-1
+- Update from upstream unstable 2.1.6 to 2.1.6
+- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075)
+- Added explicit requirement on libgnomeprint22 >= 2.8.0
+- Added BuildRequires: gtk-doc
+- Updated requirements:
+  * gtkhtml3 from 3.5.6 to 3.5.7
+  * libgal2 from 2.3.4 to 2.3.5
+  * eds from 1.1.5 to 1.1.6
+
+* Wed Feb  9 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.5-1
+- Update from upstream unstable 2.1.4 to 2.1.5
+- Updated requirements:
+  * gtkhtml3 from 3.5.4 to 3.5.6
+  * libgal2 from 2.3.3 to 2.3.4
+  * eds from 1.1.4.1 to 1.1.5
+- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2
+
+* Wed Jan 26 2005 David Malcolm <dmalcolm@redhat.com> - 2.1.4-1
+- Update from upstream stable 2.0.3 to unstable 2.1.4
+- Updated evo_major from 2.0 to 2.2
+- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2
+- Added plugins to the packaged files
+- Added weather icons to the packaged files
+- Updated requirements:
+  * gtkhtml3 from 3.3.2 to 3.5.4
+  * libgal2 from 2.2.4 to 2.3.3
+  * eds from 1.0.3 to 1.1.4.1
+  * libsoup from 2.2.0 to 2.2.2
+- Added built-time requirement on atk-devel
+- Enable all plugins for now
+- Added requirement on dbus (for the new-mail-notify plugin)
+- Enable gtk-doc
+- Updated GConf schema name suffixes from 2.0 to 2.2
+
+* Sun Dec 19 2004 Christopher Aillon <caillon@redhat.com> 2.0.3-2
+- Rebuild against mozilla 1.7.5
+
+* Wed Dec 15 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.3-1
+- Update from upstream 2.0.2 to 2.0.3 with these bug fixes:
+ * Addressbook
+   XB67656 - almost the same email address are considrered identical (Siva)
+   XB69079 - Data repeated after save with bad date format (Siva)
+   XB66854 - Some strings are missed to translation (Rodney)
+
+ * 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)
+   XB68077 - appointment dialog re-size (Rodrigo)
+   - leak fixes (Chen)
+   - sensitize menu items in list view properly (JP)
+   - redraw display when 24hr time setting changes (JP)
+
+ * Mail
+   XB69533 - Unable to subscribe to the alt hierarchy (Michael)
+   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) 
+   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)
+   XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael)
+   XB69851 - remember password check doesn't stick (Michael)
+   XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek)
+   XB69339 - postscript and some other attachments not visable (Michael)
+   XB69579 - vFoldersXBUNMATCHED generates errors (Michael)
+   XB68958 - current message forgotten in vfolders (Michael)
+   XB68974 - Wizard doesn't store smtp auth settings (Michael)
+   XB67496 - html email not rendered in preview pane (Michael)
+   XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael)
+   XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael)
+   XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael)
+   XB67622 - SMTP auth usernames containing % character fail (Jeff)
+   - fix pthread_key_delete args (Julio M. Merino Vidal)
+- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above)
+- Update dependency on e-d-s from 1.0.2 to 1.0.3
+- Update dependency on libgal2 from 2.2.3 to 2.2.4
+
+* Wed Dec  1 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-6
+- Fix broken properties dialog for "Unmatched" vfolder (#141458)
+
+* Wed Oct 27 2004 Christopher Aillon <caillon@redhat.com> - 2.0.2-4
+- Re-enable s390(x)
+
+* Fri Oct 22 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-3
+- added requirement on gnutls/gnutls-devel
+
+* Fri Oct 22 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-2
+- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13
+
+* Tue Oct 12 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.2-1
+- Update from 2.0.1 to 2.0.2
+- Updated dependency on e-d-s from 1.0.1 to 1.0.2
+- Updated dependency on libgal2 from 2.2.2 to 2.2.3
+- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2
+- ppc's mozilla dependency is now in line with the other architectures at 1.7.3
+
+* Sat Oct  9 2004 David Malcolm <dmalcolm@redhat.com>
+- disable s390/s390x for now
+
+* Fri Oct  8 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.1-3
+- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop
+- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink
+
+* Tue Sep 28 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.1-2
+- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all)
+
+* Tue Sep 28 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.1-1
+- Update from 2.0.0 to 2.0.1
+- Updated dependency on e-d-s from 1.0.0 to 1.0.1
+- Updated dependency on libgal2 from 2.2.0 to 2.2.2
+
+* Mon Sep 20 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.0-2
+- rebuilt
+
+* Tue Sep 14 2004 David Malcolm <dmalcolm@redhat.com> - 2.0.0-1
+- Update from 1.5.94.1 to 2.0.0
+- Change source FTP location from 1.5 to 2.0
+- Updated dependency on e-d-s from 0.0.99 to 1.0.0
+- Documentation has now moved from 1.5 to 2.0
+
+* Tue Aug 31 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.94.1-1
+- updated tarball from 1.5.93 to 1.5.94.1
+- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball
+- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0
+- updated dependency on libsoup from 2.1.13 to 2.2.0
+- updated dependency on e-d-s from 0.0.98 to 0.0.99
+
+* Tue Aug 17 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.93-2
+- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142)
+
+* Mon Aug 16 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.93-1
+- updated tarball from 1.5.92.2 to 1.5.93
+- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain.
+- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14
+- updated dependency on libsoup from 2.1.12 to 2.1.13
+- updated dependency on e-d-s from 0.0.97 to 0.0.98
+
+* Wed Aug 11 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.92.2-2
+- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place
+
+* Wed Aug 11 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.92.2-1
+- updated tarball from 1.5.92.1 to 1.5.92.2
+
+* Wed Aug  4 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.92.1-1
+- updated tarball from 1.5.91 to 1.5.92.1
+- added a dependency on gnome-icon-theme
+- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13
+- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0
+- updated dependency on libsoup from 2.1.11 to 2.1.12
+- updated dependency on e-d-s from 0.0.95 to 0.0.97
+
+* Mon Jul 26 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.91-1
+- 1.5.91
+
+* Thu Jul  8 2004 Jeremy Katz <katzj@redhat.com> - 1.5.90-5
+- use mozilla 1.7 on platforms where it's available
+- check to make sure the appropriate mozilla headers exist if using
+  mozilla nss for ssl or fail the build
+
+* Thu Jul  8 2004 David Malcolm <dmalcolm@redhat.com>
+- rebuilt
+
+* Wed Jul  7 2004 David Malcolm <dmalcolm@redhat.com>
+- rebuilt
+
+* Tue Jul  6 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.90-2
+- Fixed sources file
+
+* Tue Jul  6 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.90-1
+- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s
+
+* Thu Jun 17 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.9.2-1
+- 1.5.9.2
+
+* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jun  8 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.9.1-3
+- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags
+
+* Mon Jun  7 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.9.1-2
+- updated filechooser patch again
+
+* Mon Jun  7 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.9.1-1
+- 1.5.9.1; updated filechooser patch
+
+* Wed May 26 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.8-3
+- added ORBit2 and spamassassin requirements
+
+* Mon May 24 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.8-2
+- Fixed up filechooser patch and re-enabled it
+
+* Fri May 21 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.8-1
+- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now
+
+* Tue May  4 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-3
+- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4
+
+* Thu Apr 22 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-2
+- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4
+
+* Wed Apr 21 2004 David Malcolm <dmalcolm@redhat.com> - 1.5.7-1
+- 1.5.7
+
+* Wed Mar 10 2004 Jeremy Katz <katzj@redhat.com> - 1.5.5-1
+- 1.5.5
+
+* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* 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> 
+- buildrequire e-d-s-devel instead of e-d-s (#114712)
+- enable nntp support (#114802)
+
+* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Tue Jan 27 2004 Jeremy Katz <katzj@redhat.com> 1.5.3-1
+- 1.5.3
+
+* Wed Jan 21 2004 Jeremy Katz <katzj@redhat.com> 1.5.2-2
+- size_t/int mismatch compile fix for 64bit platforms
+
+* Wed Jan 14 2004 Jeremy Katz <katzj@redhat.com> 1.5.2-0
+- 1.5.2
+- add patch to fix gconf warning with schema
+
+* Sun Jan  4 2004 Jeremy Katz <katzj@redhat.com> 1.5.1-0
+- 1.5.1
+- temporarily disable redhatify patch
+- use mozilla-nss for SSL
+- fix schema names
+
+* Thu Nov  6 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-8
+- fall back to HELO for ESMTP (#108753)
+
+* Tue Oct 28 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-7
+- 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 
+  (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 
+  IPv6 support
+- add patch from upstream with reply-to-list shortcut (Ctrl-l)
+
+* Wed Oct 15 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-4
+- really, really remove duplicate menu entry (#103826)
+
+* Tue Oct 14 2003 Jeremy Katz <katzj@redhat.com> 1.4.5-3
+- Pull in some patches from upstream CVS
+  * Avoid division by zero with POP (X#41610)
+  * Don't mangle headers (X#33545)
+  * Prefix IPV6 numeric hosts properly (X#46006, #105028)
+  * 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) 
+- really remove duplicate menu entry (#103826)
+
+* 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> 
+- 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> 
+- 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 
+  composer with new libbonobo
+
+* 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 
+  different charsets (#102899)
+- add requires on newer version of ORBit2 (#103386)
+- 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
+- include static libs (#102834)
+
+* Wed Aug  6 2003 Jeremy Katz <katzj@redhat.com> 1.4.4-3
+- add a -devel subpackage (#99376)
+
+* 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> 
+- buildrequires fixup from Ville Skytta (#101325)
+
+* Thu Jul 24 2003 Jeremy Katz <katzj@redhat.com> 1.4.3-6
+- include tagoh's patch for printing cjk contacts (committed upstream, #99374)
+
+* Tue Jul 22 2003 Nalin Dahyabhai <nalin@redhat.com> 1.4.3-5
+- rebuild
+
+* Tue Jul 15 2003 Jeremy Katz <katzj@redhat.com> 1.4.3-4
+- build on all arches again
+
+* Mon Jul 14 2003 Jeremy Katz <katzj@redhat.com> 1.4.3-3
+- rebuild
+
+* 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> 
+- make gal version dep more explicit
+
+* 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
+- rebuild
+- excludearch ppc64 for now
+
+* Mon Jun  9 2003 Jeremy Katz <katzj@redhat.com> 1.4.0-1
+- 1.4.0
+
+* Thu Jun 05 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Jun  5 2003 Jeremy Katz <katzj@redhat.com> 1.3.92-2
+- rebuild
+
+* 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
+- 1.3.92
+
+* Wed May  7 2003 Jeremy Katz <katzj@redhat.com> 1.3.3-2
+- fix default for /schemas/apps/evolution/mail/display/mime_types
+
+* Tue May  6 2003 Jeremy Katz <katzj@redhat.com> 1.3.3-1
+- 1.3.3
+
+* Sun May  4 2003 Jeremy Katz <katzj@redhat.com> 1.3.2-2
+- enable pilot support
+- add redhatify patch back
+
+* Tue Apr 22 2003 Jeremy Katz <katzj@redhat.com>
+- add a /usr/bin/evolution symlink
+
+* 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> 
+- update to 1.3
+- don't build with pilot support for now
+- don't redhat-ify the summary prefs for now
+
+* Sun Apr  6 2003 Jeremy Katz <katzj@redhat.com> 1.2.4-2
+- fix krb5 libdir for lib64 systems
+
+* Sun Apr  6 2003 Jeremy Katz <katzj@redhat.com> 1.2.4-1
+- update to 1.2.4
+
+* Thu Apr  3 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-7
+- oops, fix a tyop
+
+* 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> 
+- add some buildrequires (#87612)
+
+* Mon Mar 24 2003 Jeremy Katz <katzj@redhat.com> 1.2.3-1
+- update to 1.2.3
+
+* Wed Mar 19 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-5
+- 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 
+    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 
+  to newer from upstream.
+- fix directory checking in proxy patch
+
+* Thu Feb 20 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-2
+- add missing build dep (#84388)
+- add patch from upstream for evolution-mail memleak
+- add patch from upstream to use the gnome2 proxy settings by default
+
+* Fri Feb  7 2003 Jeremy Katz <katzj@redhat.com> 1.2.2-1
+- 1.2.2
+- build on x86_64 
+
+* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
+- rebuilt
+
+* Tue Jan  7 2003 Nalin Dahyabhai <nalin@redhat.com> 1.2.1-4
+- rebuild
+
+* Fri Jan  3 2003 Nalin Dahyabhai <nalin@redhat.com>
+- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig
+
+* Thu Jan  2 2003 Jeremy Katz <katzj@redhat.com> 1.2.1-3
+- we don't want to use native POSIX threads for mutexes in db3, override them
+
+* Mon Dec 16 2002 Tim Powers <timp@redhat.com> 1.2.1-2
+- rebuild
+
+* Fri Dec 13 2002 Jeremy Katz <katzj@redhat.com> 1.2.1-1
+- update to 1.2.1
+
+* 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 
+  although everything appears to be built with -fPIC correctly
+
+* Tue Dec 10 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-5
+- patch for multilib krb5
+
+* Mon Dec  2 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-4
+- 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 
+  more platforms
+- build on all arches
+
+* Fri Nov 22 2002 Jeremy Katz <katzj@redhat.com>
+- require bonobo-conf, not -devel (#78398)
+
+* Wed Nov 20 2002 Florian La Roche <Florian.LaRoche@redhat.de> 1.2.0-3
+- 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 
+  newer mozillas with headers in new locations
+- buildrequire pilot-link-devel (#78077)
+- drop uneeded ldapv3 patch (toshok says 1.2 already handles this)
+- drop unneeded patch for ordering of the libdb checks
+- add fejj's patch to always subscribe to the inbox from evolution-patches
+
+* Tue Nov 12 2002 Jeremy Katz <katzj@redhat.com> 1.2.0-1
+- 1.2.0
+
+* Sat Nov  2 2002 Jeremy Katz <katzj@redhat.com> 1.1.90-2
+- reenable pilot support
+- redhatify
+
+* Fri Nov  1 2002 Jeremy Katz <katzj@redhat.com> 1.1.90-1
+- update to 1.1.90
+
+* Thu Oct 31 2002 Jeremy Katz <katzj@redhat.com>
+- include mozilla epochs in requires (#74577)
+- add build requires on newer oaf (#76801)
+
+* Thu Oct 24 2002 Jeremy Katz <katzj@redhat.com> 1.1.2-1
+- update to 1.1.2
+- remove unpackaged files from the buildrooot
+- disable pilot support for now
+
+* Tue Sep  3 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-10
+- add freetype-devel to build requires (#73319)
+
+* Mon Sep  2 2002 Owen Taylor <otaylor@redhat.com>
+- Fix a problem where evolution-mail right click items corrupted the stack
+  (#67992)
+
+* Thu Aug 29 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-9
+- don't install two desktop files (#72871)
+
+* Wed Aug 28 2002 Preston Brown <pbrown@redhat.com> 1.0.8-8
+- absolute symlink .desktop file (#72913)
+
+* Thu Aug 22 2002 han Ngo <than@redhat.com> 1.0.8-7
+- rebuild against new pilot-link
+
+* Sat Aug 10 2002 Florian La Roche <Florian.LaRoche@redhat.de>
+- bzip2 source
+
+* Tue Aug  6 2002 Than Ngo <than@redhat.com> 1.0.8-5
+- rebuild against new pilot-link-0.11.2
+
+* Thu Jul 18 2002 Jeremy Katz <katzj@redhat.com> 1.0.8-4
+- rebuild against new gnome-pilot
+
+* 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 
+- remove dead sites from summary list (#64522)
+- 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 
+
+* Thu Jun 27 2002 Jeremy Katz <katzj@redhat.com> 1.0.7-2
+- 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
+- update to 1.0.7
+- excludearch alpha while mozilla isn't being built there
+
+* Sun May 26 2002 Tim Powers <timp@redhat.com> 1.0.5-2
+- automated rebuild
+
+* Mon May 13 2002 Jeremy Katz <katzj@redhat.com> 1.0.5-1
+- update to 1.0.5
+
+* 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 
+  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 
+  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 
+  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 
+  in addressbook
+- fix a crash in the startup wizard
+
+* Sun Mar 31 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-2
+- move desktop file to /etc/X11/applnk (#62399)
+
+* Sun Mar 24 2002 Jeremy Katz <katzj@redhat.com> 1.0.3-1
+- update to evolution 1.0.3
+- change summary view to show a recent errata list by default
+
+* Thu Mar 14 2002 Jeremy Katz <katzj@redhat.com>
+- 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 
+  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
+  to resolve the requirements
+
+* Thu Feb 21 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-2
+- rebuild in new environment
+- temporarily exclude on ia64 again
+
+* Thu Jan 31 2002 Jeremy Katz <katzj@redhat.com> 1.0.2-1
+- update to 1.0.2
+
+* Mon Jan 28 2002 Jeremy Katz <katzj@redhat.com> 1.0.1-4
+- build on ia64 now that mozilla exists for ia64
+
+* Sun Jan 27 2002 Jeremy Katz <katzj@redhat.com> 1.0.1-3
+- rebuild in new environment
+- 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 
+  statically as intended
+
+* Sat Jan 12 2002 Jeremy Katz <katzj@redhat.com> 1.0.1-1
+- update to 1.0.1
+- patch for autoconf 2.52 accepted upstream
+- include man page
+- use --with-sub-version=" (%%{version}-%%{release})"
+
+* 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 
+  builds working with autoconf 2.52
+- conditionalize static libnss stuff so that it can go away when we
+  have a mozilla with shared libnss
+
+* Thu Dec  6 2001 Jeremy Katz <katzj@redhat.com> 1.0-1.7.2
+- add patches off of branch for:
+  * do not show up as Preview Release in version string
+  * have next/previous work with multiple selected messages
+- build without pilot support
+
+* Mon Dec  3 2001 Jeremy Katz <katzj@redhat.com> 1.0-1
+- and bump to 1.0
+
+* Sun Dec  2 2001 Jeremy Katz <katzj@redhat.com>
+- let's build with an included copy of libnss now since OpenSSL is support
+  is disabled on the 1.0 branch
+- build with --enable-dot-locking=no
+- excludearch ia64 again now that we need libnspr
+
+* Mon Nov 26 2001 Jeremy Katz <katzj@redhat.com>
+- build with gnome-pilot and krb5 support
+- conditionalize ldap, pilot and krb5 support
+- clean up buildrequires some
+
+* 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) 
+
+* Fri Nov  9 2001 Jeremy Katz <katzj@redhat.com>
+- add explicit requires on current bonobo, oaf, and GConf to help people
+  help themselves
+- 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 
+  fix the SSL hangs
+
+* Wed Nov  7 2001 Jeremy Katz <katzj@redhat.com>
+- fix filelist to include libical zoneinfo
+- add devel subpackage with includes and static libs
+
+* Mon Nov  5 2001 Jeremy Katz <katzj@redhat.com>
+- updated to 0.99.0 aka 1.0 RC1
+
+* Tue Oct 23 2001 Havoc Pennington <hp@redhat.com>
+- 0.16 snagged from Ximian GNOME
+
+* Fri Oct  5 2001 Havoc Pennington <hp@redhat.com>
+- initial build based on David Sainty's specfile
+
+* Thu Oct 04 2001 David Sainty <dsainty@redhat.com>
+- Updated to 0.15.99, 20011004 from cvs.
+
+* Wed Sep 05 2001 David Sainty <dsainty@redhat.com>
+- Updated to 0.13.99, 20010905 from cvs.
+
+* Mon Sep 03 2001 David Sainty <dsainty@redhat.com>
+- Updated to 0.13.99, 20010903 from cvs.
+- Fixed Requires + BuildRequires
+
+* Mon Aug 06 2001 David Sainty <dsainty@redhat.com>
+- Updated to 0.12.99, 20010806 from cvs.
+
+* Mon Aug 06 2001 David Sainty <dsainty@redhat.com>
+- Relocated libical* from /usr/lib due to kdepim, -2
+
+* Mon Aug 06 2001 David Sainty <dsainty@redhat.com>
+- First spec file for evolution.
+
diff --git a/flatpak-evolution-fix-service-names.sh b/flatpak-evolution-fix-service-names.sh
new file mode 100755
index 0000000..9454543
--- /dev/null
+++ b/flatpak-evolution-fix-service-names.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# see https://gitlab.gnome.org/GNOME/glib/issues/1737
+# previous versions used milliseconds instead of seconds as the timeout argument",
+(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
+
+sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"
diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
new file mode 100644
index 0000000..1b42f20
--- /dev/null
+++ b/flatpak-evolution-wrapper.sh.in
@@ -0,0 +1,30 @@
+#!/bin/bash
+
+if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
+   /app/bin/evolution.bin "$@"
+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)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-source-registry &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-addressbook-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-calendar-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
+   fi
+
+   /app/bin/evolution.bin "$@"
+fi
diff --git a/sources b/sources
new file mode 100644
index 0000000..44b2a96
--- /dev/null
+++ b/sources
@@ -0,0 +1,2 @@
+e76c26e1b38cfd295cb3e7a74e3cef88  emoji.data
+ec866ca2cb5ee60c00de9be0beec5f2a  evolution-3.40.4.tar.xz
diff --git a/webkitgtk-2.36.0-dark-theme.patch b/webkitgtk-2.36.0-dark-theme.patch
new file mode 100644
index 0000000..025ea9e
--- /dev/null
+++ b/webkitgtk-2.36.0-dark-theme.patch
@@ -0,0 +1,51 @@
+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
+
diff --git a/webkitgtk-2.36.0-disable-hw-accel.patch b/webkitgtk-2.36.0-disable-hw-accel.patch
new file mode 100644
index 0000000..e669f43
--- /dev/null
+++ b/webkitgtk-2.36.0-disable-hw-accel.patch
@@ -0,0 +1,27 @@
+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
+