From 723355dd749df83aabcc36dc300470888101c600 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Aug 2018 11:26:42 +0200 Subject: [PATCH 1/8] Update to 3.29.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b742433..d7de872 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.4.tar.xz /evolution-3.29.90.tar.xz /evolution-3.29.91.tar.xz +/evolution-3.29.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 0cfecf9..bba697e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.29.91 +Version: 3.29.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -502,6 +502,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Aug 27 2018 Milan Crha - 3.29.92-1 +- Update to 3.29.92 + * Mon Aug 13 2018 Milan Crha - 3.29.91-1 - Update to 3.29.91 diff --git a/sources b/sources index 8d4f808..8357f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.91.tar.xz) = 3b311d14f49ae4c90abf996693f2fdb9104913dd655f9e96391921bbaff0cbb2230e3a1da6ac7c7a5c8a3c592a3fd91001b8b271d2d8c3f09e0d283b81877f68 +SHA512 (evolution-3.29.92.tar.xz) = b667124b25261f875ad066445a103ad9d62602b1c25bee611b342dcd12175f19fecf7021739e5161afd579a5960321ebece3cfb06b409db2e304c88ab26a5032 From 9c97b33f5ad8894716de08bcef905528426d408c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2018 10:04:16 +0200 Subject: [PATCH 2/8] Update to 3.30.0; Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels) --- .gitignore | 1 + evolution-3.30.0-evo-issue-86.patch | 340 ++++++++++++++++++++++++++++ evolution.spec | 12 +- sources | 2 +- 4 files changed, 352 insertions(+), 3 deletions(-) create mode 100644 evolution-3.30.0-evo-issue-86.patch diff --git a/.gitignore b/.gitignore index d7de872..b53a4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.90.tar.xz /evolution-3.29.91.tar.xz /evolution-3.29.92.tar.xz +/evolution-3.30.0.tar.xz diff --git a/evolution-3.30.0-evo-issue-86.patch b/evolution-3.30.0-evo-issue-86.patch new file mode 100644 index 0000000..261cb02 --- /dev/null +++ b/evolution-3.30.0-evo-issue-86.patch @@ -0,0 +1,340 @@ +diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c +index ea3bf6f987..f89565f7e2 100644 +--- a/src/e-util/test-html-editor-units-bugs.c ++++ b/src/e-util/test-html-editor-units-bugs.c +@@ -1208,6 +1208,120 @@ test_bug_750636 (TestFixture *fixture) + g_test_fail (); + } + ++static void ++test_issue_86 (TestFixture *fixture) ++{ ++ const gchar *source_text = ++ "normal text\n" ++ "\n" ++ "> level 1\n" ++ "> level 1\n" ++ "> > level 2\n" ++ "> > level 2\n" ++ "> >\n" ++ "> > level 2\n" ++ ">\n" ++ "> level 1\n" ++ "> level 1\n" ++ ">\n" ++ "> > > level 3\n" ++ "> > > level 3\n" ++ ">\n" ++ "> > level 2\n" ++ "> > level 2\n" ++ ">\n" ++ "> level 1\n" ++ "\n" ++ "back normal text\n"; ++ gchar *converted, *to_insert; ++ ++ if (!test_utils_process_commands (fixture, ++ "mode:html\n")) { ++ g_test_fail (); ++ return; ++ } ++ ++ converted = camel_text_to_html (source_text, ++ CAMEL_MIME_FILTER_TOHTML_PRE | ++ CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | ++ CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES | ++ CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION, ++ 0xDDDDDD); ++ ++ g_return_if_fail (converted != NULL); ++ ++ to_insert = g_strconcat (converted, ++ "" ++ "", ++ NULL); ++ ++ test_utils_insert_content (fixture, to_insert, ++ E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML); ++ ++ if (!test_utils_run_simple_test (fixture, ++ "", ++ HTML_PREFIX "
On Today, User wrote:
" ++ "
" ++ "
normal text
" ++ "

" ++ "
" ++ "
level 1
" ++ "
level 1
" ++ "
" ++ "
level 2
" ++ "
level 2
" ++ "

" ++ "
level 2
" ++ "
" ++ "

" ++ "
level 1
" ++ "
level 1
" ++ "

" ++ "
" ++ "
" ++ "
level 3
" ++ "
level 3
" ++ "
" ++ "
" ++ "

" ++ "
" ++ "
level 2
" ++ "
level 2
" ++ "
" ++ "

" ++ "
level 1
" ++ "
" ++ "

" ++ "
back normal text
" ++ "
" HTML_SUFFIX, ++ "On Today, User wrote:\n" ++ "> normal text\n" ++ "> \n" ++ "> > level 1\n" ++ "> > level 1\n" ++ "> > > level 2\n" ++ "> > > level 2\n" ++ "> > > \n" ++ "> > > level 2\n" ++ "> > \n" ++ "> > level 1\n" ++ "> > level 1\n" ++ "> > \n" ++ "> > > > level 3\n" ++ "> > > > level 3\n" ++ "> > \n" ++ "> > > level 2\n" ++ "> > > level 2\n" ++ "> > \n" ++ "> > level 1\n" ++ "> \n" ++ "> back normal text")) ++ g_test_fail (); ++ ++ g_free (to_insert); ++ g_free (converted); ++} ++ + void + test_add_html_editor_bug_tests (void) + { +@@ -1237,4 +1351,5 @@ test_add_html_editor_bug_tests (void) + test_utils_add_test ("/bug/780088", test_bug_780088); + test_utils_add_test ("/bug/788829", test_bug_788829); + test_utils_add_test ("/bug/750636", test_bug_750636); ++ test_utils_add_test ("/issue/86", test_issue_86); + } +diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index bdef1ccf57..71d80ae5a7 100644 +--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPage *editor_page, + WEBKIT_DOM_NODE (content_wrapper), + WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)), + NULL); +- + if (!cite_body) { + if (!empty) { + WebKitDOMNode *child; +@@ -8804,6 +8803,133 @@ e_editor_dom_adapt_to_editor_dom_changes (EEditorPage *editor_page) + g_clear_object (&collection); + } + ++static void ++traverse_nodes_to_split_pre (WebKitDOMDocument *document, ++ WebKitDOMNode *node, ++ WebKitDOMNode *new_parent, /* can be NULL, then prepend to out_new_nodes */ ++ gboolean is_in_pre, ++ GSList **out_new_nodes) /* WebKitDOMNode * */ ++{ ++ if (is_in_pre && WEBKIT_DOM_IS_TEXT (node)) { ++ gchar *text; ++ ++ text = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (node)); ++ if (text) { ++ WebKitDOMElement *pre; ++ gint ii; ++ gchar **strv; ++ ++ strv = g_strsplit (text, "\n", -1); ++ ++ for (ii = 0; strv && strv[ii]; ii++) { ++ if (*(strv[ii])) { ++ gint len = strlen (strv[ii]); ++ ++ if (strv[ii][len - 1] == '\r') { ++ strv[ii][len - 1] = '\0'; ++ } ++ } ++ ++ /* 
 is shown as a block, thus adding a new line at the end behaves like two 
-s */
++				if (!*(strv[ii]) && !strv[ii + 1])
++					break;
++
++				pre = webkit_dom_document_create_element (document, "pre", NULL);
++
++				if (*(strv[ii])) {
++					webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre), strv[ii], NULL);
++				} else {
++					WebKitDOMElement *br;
++
++					br = webkit_dom_document_create_element (document, "br", NULL);
++					webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
++				}
++
++				if (new_parent)
++					webkit_dom_node_append_child (new_parent, WEBKIT_DOM_NODE (pre), NULL);
++				else
++					*out_new_nodes = g_slist_prepend (*out_new_nodes, pre);
++			}
++
++			g_strfreev (strv);
++		}
++
++		g_free (text);
++	} else if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (node)) {
++		is_in_pre = TRUE;
++	} else {
++		WebKitDOMNode *nd;
++		GError *error = NULL;
++
++		nd = webkit_dom_node_clone_node_with_error (node, FALSE, &error);
++		if (nd) {
++			if (new_parent)
++				webkit_dom_node_append_child (new_parent, nd, NULL);
++			else
++				*out_new_nodes = g_slist_prepend (*out_new_nodes, nd);
++
++			new_parent = nd;
++		} else {
++			g_warning ("%s: Failed to clone node %s: %s\n", G_STRFUNC, G_OBJECT_TYPE_NAME (node), error ? error->message : "Unknown error");
++		}
++	}
++
++	for (node = webkit_dom_node_get_first_child (node);
++	     node;
++	     node = webkit_dom_node_get_next_sibling (node)) {
++		traverse_nodes_to_split_pre (document, node, new_parent, is_in_pre, out_new_nodes);
++	}
++}
++
++static void
++maybe_split_pre_paragraphs (WebKitDOMDocument *document)
++{
++	WebKitDOMHTMLElement *body;
++	WebKitDOMNodeList *list;
++
++	body = webkit_dom_document_get_body (document);
++	if (!body)
++		return;
++
++	list = webkit_dom_document_query_selector_all (document, "pre", NULL);
++	if (webkit_dom_node_list_get_length (list)) {
++		WebKitDOMNode *body_node, *node, *current;
++		GSList *new_nodes = NULL, *to_remove = NULL, *link;
++
++		g_clear_object (&list);
++
++		body_node = WEBKIT_DOM_NODE (body);
++		webkit_dom_node_normalize (body_node);
++
++		for (current = webkit_dom_node_get_first_child (body_node);
++		     current;
++		     current = webkit_dom_node_get_next_sibling (current)) {
++			traverse_nodes_to_split_pre (document, current, NULL, FALSE, &new_nodes);
++			to_remove = g_slist_prepend (to_remove, current);
++		}
++
++		for (link = to_remove; link; link = g_slist_next (link)) {
++			node = link->data;
++
++			webkit_dom_node_remove_child (body_node, node, NULL);
++		}
++
++		/* They are in reverse order, thus reverse it */
++		new_nodes = g_slist_reverse (new_nodes);
++
++		for (link = new_nodes; link; link = g_slist_next (link)) {
++			node = link->data;
++
++			webkit_dom_node_append_child (body_node, node, NULL);
++		}
++
++		g_slist_free (to_remove);
++		g_slist_free (new_nodes);
++	}
++
++	g_clear_object (&list);
++}
++
+ void
+ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
+ {
+@@ -8853,60 +8979,8 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
+ 		}
+ 
+ 		goto out;
+-	} else {
+-		WebKitDOMNodeList *list;
+-		gulong ii;
+-
+-		list = webkit_dom_document_query_selector_all (document, "pre", NULL);
+-		for (ii = webkit_dom_node_list_get_length (list); ii--;) {
+-			WebKitDOMNode *node = webkit_dom_node_list_item (list, ii), *parent;
+-			WebKitDOMElement *element;
+-			gchar *inner_html;
+-
+-			element = WEBKIT_DOM_ELEMENT (node);
+-			parent = webkit_dom_node_get_parent_node (node);
+-			inner_html = webkit_dom_element_get_inner_html (element);
+-
+-			if (inner_html && *inner_html) {
+-				gchar **strv;
+-
+-				strv = g_strsplit (inner_html, "\n", -1);
+-				if (strv && strv[0] && strv[1]) {
+-					WebKitDOMElement *pre;
+-					gint jj;
+-
+-					for (jj = 0; strv[jj]; jj++) {
+-						pre = webkit_dom_document_create_element (document, "pre", NULL);
+-						if (*(strv[jj])) {
+-							gint len = strlen (strv[jj]);
+-
+-							if (strv[jj][len - 1] == '\r') {
+-								strv[jj][len - 1] = '\0';
+-							}
+-						}
+-
+-						if (*(strv[jj])) {
+-							webkit_dom_html_element_set_inner_html (WEBKIT_DOM_HTML_ELEMENT (pre), strv[jj], NULL);
+-						} else {
+-							WebKitDOMElement *br;
+-
+-							br = webkit_dom_document_create_element (document, "br", NULL);
+-							webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
+-						}
+-
+-						webkit_dom_node_insert_before (parent, WEBKIT_DOM_NODE (pre), node, NULL);
+-					}
+-
+-					remove_node (node);
+-				}
+-
+-				g_strfreev (strv);
+-			}
+-
+-			g_free (inner_html);
+-		}
+-
+-		g_clear_object (&list);
++	} else if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) {
++		maybe_split_pre_paragraphs (document);
+ 	}
+ 
+ 	e_editor_dom_adapt_to_editor_dom_changes (editor_page);
diff --git a/evolution.spec b/evolution.spec
index bba697e..8f03e99 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,16 +28,18 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.29.92
+Version: 3.30.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 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.29/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
+Patch01: evolution-3.30.0-evo-issue-86.patch
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -211,6 +213,8 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q -n evolution-%{version}
 
+%patch01 -p1 -b .evo-issue-86
+
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
@@ -502,6 +506,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Sep 03 2018 Milan Crha  - 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  - 3.29.92-1
 - Update to 3.29.92
 
diff --git a/sources b/sources
index 8357f53..6ef8d59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.29.92.tar.xz) = b667124b25261f875ad066445a103ad9d62602b1c25bee611b342dcd12175f19fecf7021739e5161afd579a5960321ebece3cfb06b409db2e304c88ab26a5032
+SHA512 (evolution-3.30.0.tar.xz) = 15a28dc4cd3b4a194deadd7bb205e9942f193f8f5894e2cdd83e71404535cd9c43223e38d59eaa5dc9cdc977c057ee4f155df397e56079daa8432a6414010a01

From d20a49a06b43b24357ae058600b866eb67ce0f48 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 24 Sep 2018 09:56:16 +0200
Subject: [PATCH 3/8] Update to 3.30.1; Remove patch for GNOME Evolution issue
 #86 (fixed upstream)

---
 .gitignore                          |   1 +
 evolution-3.30.0-evo-issue-86.patch | 340 ----------------------------
 evolution.spec                      |  10 +-
 sources                             |   2 +-
 4 files changed, 7 insertions(+), 346 deletions(-)
 delete mode 100644 evolution-3.30.0-evo-issue-86.patch

diff --git a/.gitignore b/.gitignore
index b53a4ba..36929b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.29.91.tar.xz
 /evolution-3.29.92.tar.xz
 /evolution-3.30.0.tar.xz
+/evolution-3.30.1.tar.xz
diff --git a/evolution-3.30.0-evo-issue-86.patch b/evolution-3.30.0-evo-issue-86.patch
deleted file mode 100644
index 261cb02..0000000
--- a/evolution-3.30.0-evo-issue-86.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
-index ea3bf6f987..f89565f7e2 100644
---- a/src/e-util/test-html-editor-units-bugs.c
-+++ b/src/e-util/test-html-editor-units-bugs.c
-@@ -1208,6 +1208,120 @@ test_bug_750636 (TestFixture *fixture)
- 		g_test_fail ();
- }
- 
-+static void
-+test_issue_86 (TestFixture *fixture)
-+{
-+	const gchar *source_text =
-+		"normal text\n"
-+		"\n"
-+		"> level 1\n"
-+		"> level 1\n"
-+		"> > level 2\n"
-+		"> > level 2\n"
-+		"> >\n"
-+		"> > level 2\n"
-+		">\n"
-+		"> level 1\n"
-+		"> level 1\n"
-+		">\n"
-+		"> > > level 3\n"
-+		"> > > level 3\n"
-+		">\n"
-+		"> > level 2\n"
-+		"> > level 2\n"
-+		">\n"
-+		"> level 1\n"
-+		"\n"
-+		"back normal text\n";
-+	gchar *converted, *to_insert;
-+
-+	if (!test_utils_process_commands (fixture,
-+		"mode:html\n")) {
-+		g_test_fail ();
-+		return;
-+	}
-+
-+	converted = camel_text_to_html (source_text,
-+		CAMEL_MIME_FILTER_TOHTML_PRE |
-+		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
-+		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES |
-+		CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION,
-+		0xDDDDDD);
-+
-+	g_return_if_fail (converted != NULL);
-+
-+	to_insert = g_strconcat (converted,
-+		""
-+		"",
-+		NULL);
-+
-+	test_utils_insert_content (fixture, to_insert,
-+		E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
-+
-+	if (!test_utils_run_simple_test (fixture,
-+		"",
-+		HTML_PREFIX "
On Today, User wrote:
"
-+		"
"
-+			"
normal text
"
-+			"

"
-+			"
"
-+				"
level 1
"
-+				"
level 1
"
-+				"
"
-+					"
level 2
"
-+					"
level 2
"
-+					"

"
-+					"
level 2
"
-+				"
"
-+				"

"
-+				"
level 1
"
-+				"
level 1
"
-+				"

"
-+				"
"
-+					"
"
-+						"
level 3
"
-+						"
level 3
"
-+					"
"
-+				"
"
-+				"

"
-+				"
"
-+					"
level 2
"
-+					"
level 2
"
-+				"
"
-+				"

"
-+				"
level 1
"
-+			"
"
-+			"

"
-+			"
back normal text
"
-+		"
" HTML_SUFFIX,
-+		"On Today, User wrote:\n"
-+		"> normal text\n"
-+		"> \n"
-+		"> > level 1\n"
-+		"> > level 1\n"
-+		"> > > level 2\n"
-+		"> > > level 2\n"
-+		"> > > \n"
-+		"> > > level 2\n"
-+		"> > \n"
-+		"> > level 1\n"
-+		"> > level 1\n"
-+		"> > \n"
-+		"> > > > level 3\n"
-+		"> > > > level 3\n"
-+		"> > \n"
-+		"> > > level 2\n"
-+		"> > > level 2\n"
-+		"> > \n"
-+		"> > level 1\n"
-+		"> \n"
-+		"> back normal text"))
-+		g_test_fail ();
-+
-+	g_free (to_insert);
-+	g_free (converted);
-+}
-+
- void
- test_add_html_editor_bug_tests (void)
- {
-@@ -1237,4 +1351,5 @@ test_add_html_editor_bug_tests (void)
- 	test_utils_add_test ("/bug/780088", test_bug_780088);
- 	test_utils_add_test ("/bug/788829", test_bug_788829);
- 	test_utils_add_test ("/bug/750636", test_bug_750636);
-+	test_utils_add_test ("/issue/86", test_issue_86);
- }
-diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-index bdef1ccf57..71d80ae5a7 100644
---- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPage *editor_page,
- 			WEBKIT_DOM_NODE (content_wrapper),
- 			WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)),
- 			NULL);
--
- 	if (!cite_body) {
- 		if (!empty) {
- 			WebKitDOMNode *child;
-@@ -8804,6 +8803,133 @@ e_editor_dom_adapt_to_editor_dom_changes (EEditorPage *editor_page)
- 	g_clear_object (&collection);
- }
- 
-+static void
-+traverse_nodes_to_split_pre (WebKitDOMDocument *document,
-+			     WebKitDOMNode *node,
-+			     WebKitDOMNode *new_parent, /* can be NULL, then prepend to out_new_nodes */
-+			     gboolean is_in_pre,
-+			     GSList **out_new_nodes) /* WebKitDOMNode * */
-+{
-+	if (is_in_pre && WEBKIT_DOM_IS_TEXT (node)) {
-+		gchar *text;
-+
-+		text = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (node));
-+		if (text) {
-+			WebKitDOMElement *pre;
-+			gint ii;
-+			gchar **strv;
-+
-+			strv = g_strsplit (text, "\n", -1);
-+
-+			for (ii = 0; strv && strv[ii]; ii++) {
-+				if (*(strv[ii])) {
-+					gint len = strlen (strv[ii]);
-+
-+					if (strv[ii][len - 1] == '\r') {
-+						strv[ii][len - 1] = '\0';
-+					}
-+				}
-+
-+				/* 
 is shown as a block, thus adding a new line at the end behaves like two 
-s */
-+				if (!*(strv[ii]) && !strv[ii + 1])
-+					break;
-+
-+				pre = webkit_dom_document_create_element (document, "pre", NULL);
-+
-+				if (*(strv[ii])) {
-+					webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre), strv[ii], NULL);
-+				} else {
-+					WebKitDOMElement *br;
-+
-+					br = webkit_dom_document_create_element (document, "br", NULL);
-+					webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
-+				}
-+
-+				if (new_parent)
-+					webkit_dom_node_append_child (new_parent, WEBKIT_DOM_NODE (pre), NULL);
-+				else
-+					*out_new_nodes = g_slist_prepend (*out_new_nodes, pre);
-+			}
-+
-+			g_strfreev (strv);
-+		}
-+
-+		g_free (text);
-+	} else if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (node)) {
-+		is_in_pre = TRUE;
-+	} else {
-+		WebKitDOMNode *nd;
-+		GError *error = NULL;
-+
-+		nd = webkit_dom_node_clone_node_with_error (node, FALSE, &error);
-+		if (nd) {
-+			if (new_parent)
-+				webkit_dom_node_append_child (new_parent, nd, NULL);
-+			else
-+				*out_new_nodes = g_slist_prepend (*out_new_nodes, nd);
-+
-+			new_parent = nd;
-+		} else {
-+			g_warning ("%s: Failed to clone node %s: %s\n", G_STRFUNC, G_OBJECT_TYPE_NAME (node), error ? error->message : "Unknown error");
-+		}
-+	}
-+
-+	for (node = webkit_dom_node_get_first_child (node);
-+	     node;
-+	     node = webkit_dom_node_get_next_sibling (node)) {
-+		traverse_nodes_to_split_pre (document, node, new_parent, is_in_pre, out_new_nodes);
-+	}
-+}
-+
-+static void
-+maybe_split_pre_paragraphs (WebKitDOMDocument *document)
-+{
-+	WebKitDOMHTMLElement *body;
-+	WebKitDOMNodeList *list;
-+
-+	body = webkit_dom_document_get_body (document);
-+	if (!body)
-+		return;
-+
-+	list = webkit_dom_document_query_selector_all (document, "pre", NULL);
-+	if (webkit_dom_node_list_get_length (list)) {
-+		WebKitDOMNode *body_node, *node, *current;
-+		GSList *new_nodes = NULL, *to_remove = NULL, *link;
-+
-+		g_clear_object (&list);
-+
-+		body_node = WEBKIT_DOM_NODE (body);
-+		webkit_dom_node_normalize (body_node);
-+
-+		for (current = webkit_dom_node_get_first_child (body_node);
-+		     current;
-+		     current = webkit_dom_node_get_next_sibling (current)) {
-+			traverse_nodes_to_split_pre (document, current, NULL, FALSE, &new_nodes);
-+			to_remove = g_slist_prepend (to_remove, current);
-+		}
-+
-+		for (link = to_remove; link; link = g_slist_next (link)) {
-+			node = link->data;
-+
-+			webkit_dom_node_remove_child (body_node, node, NULL);
-+		}
-+
-+		/* They are in reverse order, thus reverse it */
-+		new_nodes = g_slist_reverse (new_nodes);
-+
-+		for (link = new_nodes; link; link = g_slist_next (link)) {
-+			node = link->data;
-+
-+			webkit_dom_node_append_child (body_node, node, NULL);
-+		}
-+
-+		g_slist_free (to_remove);
-+		g_slist_free (new_nodes);
-+	}
-+
-+	g_clear_object (&list);
-+}
-+
- void
- e_editor_dom_process_content_after_load (EEditorPage *editor_page)
- {
-@@ -8853,60 +8979,8 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
- 		}
- 
- 		goto out;
--	} else {
--		WebKitDOMNodeList *list;
--		gulong ii;
--
--		list = webkit_dom_document_query_selector_all (document, "pre", NULL);
--		for (ii = webkit_dom_node_list_get_length (list); ii--;) {
--			WebKitDOMNode *node = webkit_dom_node_list_item (list, ii), *parent;
--			WebKitDOMElement *element;
--			gchar *inner_html;
--
--			element = WEBKIT_DOM_ELEMENT (node);
--			parent = webkit_dom_node_get_parent_node (node);
--			inner_html = webkit_dom_element_get_inner_html (element);
--
--			if (inner_html && *inner_html) {
--				gchar **strv;
--
--				strv = g_strsplit (inner_html, "\n", -1);
--				if (strv && strv[0] && strv[1]) {
--					WebKitDOMElement *pre;
--					gint jj;
--
--					for (jj = 0; strv[jj]; jj++) {
--						pre = webkit_dom_document_create_element (document, "pre", NULL);
--						if (*(strv[jj])) {
--							gint len = strlen (strv[jj]);
--
--							if (strv[jj][len - 1] == '\r') {
--								strv[jj][len - 1] = '\0';
--							}
--						}
--
--						if (*(strv[jj])) {
--							webkit_dom_html_element_set_inner_html (WEBKIT_DOM_HTML_ELEMENT (pre), strv[jj], NULL);
--						} else {
--							WebKitDOMElement *br;
--
--							br = webkit_dom_document_create_element (document, "br", NULL);
--							webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
--						}
--
--						webkit_dom_node_insert_before (parent, WEBKIT_DOM_NODE (pre), node, NULL);
--					}
--
--					remove_node (node);
--				}
--
--				g_strfreev (strv);
--			}
--
--			g_free (inner_html);
--		}
--
--		g_clear_object (&list);
-+	} else if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) {
-+		maybe_split_pre_paragraphs (document);
- 	}
- 
- 	e_editor_dom_adapt_to_editor_dom_changes (editor_page);
diff --git a/evolution.spec b/evolution.spec
index 8f03e99..324d277 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,7 +28,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.0
+Version: 3.30.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -38,8 +38,6 @@ Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
-Patch01: evolution-3.30.0-evo-issue-86.patch
-
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -213,8 +211,6 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q -n evolution-%{version}
 
-%patch01 -p1 -b .evo-issue-86
-
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
@@ -506,6 +502,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Sep 24 2018 Milan Crha  - 3.30.1-1
+- Update to 3.30.1
+- Remove patch for GNOME Evolution issue #86 (fixed upstream)
+
 * Mon Sep 03 2018 Milan Crha  - 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)
diff --git a/sources b/sources
index 6ef8d59..70950d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.0.tar.xz) = 15a28dc4cd3b4a194deadd7bb205e9942f193f8f5894e2cdd83e71404535cd9c43223e38d59eaa5dc9cdc977c057ee4f155df397e56079daa8432a6414010a01
+SHA512 (evolution-3.30.1.tar.xz) = 4df32a3419592c53954794dbffbbf1e8d84e02dfd2ad23c2e6c7c8477447e5f826839ebce9325cf9ce9b484725b57f6985123ec57f3c7af438a37194b297c4de

From b06bea2882d05834553320a2f02030df7c853a63 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 22 Oct 2018 10:59:17 +0200
Subject: [PATCH 4/8] Update to 3.30.2; Disable and obsolete tests subpackage

---
 .gitignore     |  1 +
 evolution.spec | 26 +++++++++++++++++++++++---
 sources        |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36929b1..54024b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,3 +153,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.29.92.tar.xz
 /evolution-3.30.0.tar.xz
 /evolution-3.30.1.tar.xz
+/evolution-3.30.2.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 324d277..6cdf5d2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,6 +1,9 @@
 %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
+
 %define glib2_version 2.46.0
 %define gtk3_version 3.10.0
 %define gnome_autoar_version 0.1.1
@@ -28,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.1
+Version: 3.30.2
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -43,6 +46,10 @@ 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.30.1
+%endif
+
 %global eds_version %{version}
 
 ## Dependencies ###
@@ -197,6 +204,7 @@ 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
 Group: Development/Libraries
@@ -207,6 +215,7 @@ 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
 %setup -q -n evolution-%{version}
@@ -241,15 +250,20 @@ fi
 %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
+
 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 \
+	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_YTNEF=OFF \
-	-DENABLE_INSTALLED_TESTS=ON \
 	..
 
 make %{?_smp_mflags}
@@ -497,11 +511,17 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{evo_plugin_dir}/liborg-gnome-pst-import.so
 %endif
 
+%if %{enable_installed_tests}
 %files tests
 %{_libexecdir}/%{name}/installed-tests
 %{_datadir}/installed-tests
+%endif
 
 %changelog
+* Mon Oct 22 2018 Milan Crha  - 3.30.2-1
+- Update to 3.30.2
+- Disable and obsolete tests subpackage - it uses python2 and it is unmaintained upstream
+
 * Mon Sep 24 2018 Milan Crha  - 3.30.1-1
 - Update to 3.30.1
 - Remove patch for GNOME Evolution issue #86 (fixed upstream)
diff --git a/sources b/sources
index 70950d1..f99c9a0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.1.tar.xz) = 4df32a3419592c53954794dbffbbf1e8d84e02dfd2ad23c2e6c7c8477447e5f826839ebce9325cf9ce9b484725b57f6985123ec57f3c7af438a37194b297c4de
+SHA512 (evolution-3.30.2.tar.xz) = c791d6b2c7472e12c8000ac2bfa06fee06d50c76825fabd59cd4aa22b6c3f54b09c891217a05c657c3096023c49b78ccdd250b98dffae0f14a0dac1e9c9f238f

From 7fd5fe6c56c41596937bcf8bf50c879020779860 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 26 Oct 2018 14:10:15 +0200
Subject: [PATCH 5/8] Add BuildRequires/Requires for 'killall' binary

With this `evolution --force-shutdown`, alias killev, will find it
and will be able to stop evolution(-data-server) processes. It could
look also for 'pkill', but none of these seems to be part of build
root anymore. Having explicit dependency is better anyway.
---
 evolution.spec | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 6cdf5d2..ab8bd57 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -32,7 +32,7 @@
 
 Name: evolution
 Version: 3.30.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -54,6 +54,7 @@ Obsoletes: evolution-tests <= 3.30.1
 
 ## Dependencies ###
 
+Requires: %{_bindir}/killall
 Requires: evolution-data-server >= %{eds_version}
 Requires: gvfs
 Requires: gtkspell3
@@ -62,6 +63,7 @@ Requires: %{name}-langpacks = %{version}-%{release}
 
 ### Build Dependencies ###
 
+BuildRequires: %{_bindir}/killall
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gettext
@@ -518,6 +520,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 26 2018 Milan Crha  - 3.30.2-2
+- Add BuildRequires/Requires for 'killall' binary
+
 * Mon Oct 22 2018 Milan Crha  - 3.30.2-1
 - Update to 3.30.2
 - Disable and obsolete tests subpackage - it uses python2 and it is unmaintained upstream

From 7f550824082950c008ceb5c38096e73594fdf1ee Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 10 Dec 2018 10:30:26 +0100
Subject: [PATCH 6/8] Update to 3.30.3

---
 .gitignore     | 157 +------------------------------------------------
 evolution.spec |   7 ++-
 sources        |   2 +-
 3 files changed, 7 insertions(+), 159 deletions(-)

diff --git a/.gitignore b/.gitignore
index 54024b6..56bb02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,156 +1 @@
-evolution-2.31.5.tar.bz2
-/evolution-2.31.91.tar.bz2
-/evolution-2.31.92.tar.bz2
-/evolution-2.91.0.tar.bz2
-/evolution-2.91.1.tar.bz2
-/evolution-2.91.2.tar.bz2
-/evolution-2.91.3.tar.bz2
-/evolution-2.91.4.tar.bz2
-/evolution-2.91.5.tar.bz2
-/evolution-2.91.6.tar.bz2
-/evolution-2.91.6.1.tar.bz2
-/evolution-2.91.6.2.tar.bz2
-/evolution-2.91.90.tar.bz2
-/evolution-2.91.91.tar.bz2
-/evolution-2.91.92.tar.bz2
-/evolution-3.0.0.tar.bz2
-/evolution-3.1.1.tar.bz2
-/evolution-3.1.2.tar.bz2
-/evolution-3.1.3.tar.bz2
-/evolution-3.1.4.tar.bz2
-/evolution-3.1.5.tar.bz2
-/evolution-3.1.90.tar.xz
-/evolution-3.1.91.tar.xz
-/evolution-3.1.92.tar.xz
-/evolution-3.2.0.tar.xz
-/evolution-3.3.1.tar.xz
-/evolution-3.3.2.tar.xz
-/evolution-3.3.3.tar.xz
-/evolution-3.3.4.tar.xz
-/evolution-3.3.5.tar.xz
-/evolution-3.3.90.tar.xz
-/evolution-3.3.91.tar.xz
-/evolution-3.3.92.tar.xz
-/evolution-3.4.0.tar.xz
-/evolution-3.4.0.1.tar.xz
-/evolution-3.4.1.tar.xz
-/evolution-3.5.1.tar.xz
-/evolution-3.5.2.tar.xz
-/evolution-3.5.3.tar.xz
-/evolution-3.5.3.1.tar.xz
-/evolution-3.5.4.tar.xz
-/evolution-3.5.5.tar.xz
-/evolution-3.5.90.tar.xz
-/evolution-3.5.91.tar.xz
-/evolution-3.5.92.tar.xz
-/evolution-3.6.0.tar.xz
-/evolution-3.7.1.tar.xz
-/evolution-3.7.2.tar.xz
-/evolution-3.7.3.1.tar.xz
-/evolution-3.7.3.2.tar.xz
-/evolution-3.7.4.tar.xz
-/evolution-3.7.5.tar.xz
-/evolution-3.7.90.tar.xz
-/evolution-3.7.91.tar.xz
-/evolution-3.7.92.tar.xz
-/evolution-3.8.0.tar.xz
-/evolution-3.9.1.tar.xz
-/evolution-3.9.2.tar.xz
-/evolution-3.9.3.tar.xz
-/evolution-3.9.4.tar.xz
-/evolution-3.9.5.tar.xz
-/evolution-3.9.90.tar.xz
-/evolution-3.9.91.tar.xz
-/evolution-3.9.92.tar.xz
-/evolution-3.10.0.tar.xz
-/evolution-3.10.1.tar.xz
-/evolution-3.11.1.tar.xz
-/evolution-3.11.2.tar.xz
-/evolution-3.11.4.tar.xz
-/evolution-3.11.5.tar.xz
-/evolution-3.11.90.tar.xz
-/evolution-3.11.91.tar.xz
-/evolution-3.11.92.tar.xz
-/evolution-3.12.0.tar.xz
-/evolution-3.12.1.tar.xz
-/evolution-3.12.2.tar.xz
-/evolution-3.12.3.tar.xz
-/evolution-3.12.4.tar.xz
-/evolution-3.13.4.tar.xz
-/evolution-3.13.5.tar.xz
-/evolution-3.13.6.tar.xz
-/evolution-3.13.7.tar.xz
-/evolution-3.13.8.tar.xz
-/evolution-3.13.9.tar.xz
-/evolution-3.13.10.tar.xz
-/evolution-3.13.90.tar.xz
-/evolution-3.15.91.tar.xz
-/evolution-3.15.92.tar.xz
-/evolution-3.16.0.tar.xz
-/evolution-3.16.1.tar.xz
-/evolution-3.17.1.tar.xz
-/evolution-3.17.2.tar.xz
-/evolution-3.17.3.tar.xz
-/evolution-3.17.4.tar.xz
-/evolution-3.17.90.tar.xz
-/evolution-3.17.91.tar.xz
-/evolution-3.17.92.tar.xz
-/evolution-3.18.0.tar.xz
-/evolution-3.18.1.tar.xz
-/evolution-3.19.1.tar.xz
-/evolution-3.19.2.tar.xz
-/evolution-3.19.3.tar.xz
-/evolution-3.19.4.tar.xz
-/evolution-3.19.90.tar.xz
-/evolution-3.19.91.tar.xz
-/evolution-3.19.92.tar.xz
-/evolution-3.20.0.tar.xz
-/evolution-3.20.1.tar.xz
-/evolution-3.21.1.tar.xz
-/evolution-3.21.2.tar.xz
-/evolution-3.21.3.tar.xz
-/evolution-3.21.4.tar.xz
-/evolution-3.21.90.tar.xz
-/evolution-3.21.91.tar.xz
-/evolution-3.21.92.tar.xz
-/evolution-3.22.0.tar.xz
-/evolution-3.22.1.tar.xz
-/evolution-3.23.1.tar.xz
-/evolution-3.23.2.tar.xz
-/evolution-3.23.3.tar.xz
-/evolution-3.23.4.tar.xz
-/evolution-3.23.90.tar.xz
-/evolution-3.23.91.tar.xz
-/evolution-3.23.92.tar.xz
-/evolution-3.24.0.tar.xz
-/evolution-3.24.1.tar.xz
-/evolution-3.25.1.tar.xz
-/evolution-3.25.2.tar.xz
-/evolution-3.25.3.tar.xz
-/evolution-3.25.4.tar.xz
-/evolution-3.25.90.tar.xz
-/evolution-3.25.91.tar.xz
-/evolution-3.25.92.tar.xz
-/evolution-3.25.92.1.tar.xz
-/evolution-3.25.92.2.tar.xz
-/evolution-3.26.0.tar.xz
-/evolution-3.26.1.tar.xz
-/evolution-3.27.1.tar.xz
-/evolution-3.27.2.tar.xz
-/evolution-3.27.3.tar.xz
-/evolution-3.27.4.tar.xz
-/evolution-3.27.90.tar.xz
-/evolution-3.27.91.tar.xz
-/evolution-3.27.92.tar.xz
-/evolution-3.28.0.tar.xz
-/evolution-3.28.1.tar.xz
-/evolution-3.29.1.tar.xz
-/evolution-3.29.2.tar.xz
-/evolution-3.29.3.tar.xz
-/evolution-3.29.4.tar.xz
-/evolution-3.29.90.tar.xz
-/evolution-3.29.91.tar.xz
-/evolution-3.29.92.tar.xz
-/evolution-3.30.0.tar.xz
-/evolution-3.30.1.tar.xz
-/evolution-3.30.2.tar.xz
+/evolution-*.tar.xz
diff --git a/evolution.spec b/evolution.spec
index ab8bd57..e963b73 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,8 +31,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.2
-Release: 2%{?dist}
+Version: 3.30.3
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -520,6 +520,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Dec 10 2018 Milan Crha  - 3.30.3-1
+- Update to 3.30.3
+
 * Fri Oct 26 2018 Milan Crha  - 3.30.2-2
 - Add BuildRequires/Requires for 'killall' binary
 
diff --git a/sources b/sources
index f99c9a0..e5f86b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.2.tar.xz) = c791d6b2c7472e12c8000ac2bfa06fee06d50c76825fabd59cd4aa22b6c3f54b09c891217a05c657c3096023c49b78ccdd250b98dffae0f14a0dac1e9c9f238f
+SHA512 (evolution-3.30.3.tar.xz) = a9fd15f3adac7caf3453a67e2aa7933b5a7762ec45405257938460b304417175c7d54b7257ed082d2c2c02565e1505afd08960eaf507c17a7879639644a22c6c

From 0c98843428f377a2486449b40e59a892bcb92090 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 7 Jan 2019 12:39:38 +0100
Subject: [PATCH 7/8] Update to 3.30.4

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index e963b73..328eb9d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.3
+Version: 3.30.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -520,6 +520,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jan 07 2019 Milan Crha  - 3.30.4-1
+- Update to 3.30.4
+
 * Mon Dec 10 2018 Milan Crha  - 3.30.3-1
 - Update to 3.30.3
 
diff --git a/sources b/sources
index e5f86b5..9030da6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.3.tar.xz) = a9fd15f3adac7caf3453a67e2aa7933b5a7762ec45405257938460b304417175c7d54b7257ed082d2c2c02565e1505afd08960eaf507c17a7879639644a22c6c
+SHA512 (evolution-3.30.4.tar.xz) = 38b3e3cce219ad61e7f4b21f609ec259854f8d2bc60f44696171e5d5830014fd6730f34f8262eca2dc2212a001c51ff2d8dfb5df36a4c89240fbce54e1c4f826

From 05b5b61e38b2184d37cf29de26e3a56d53bbc02c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 4 Feb 2019 13:29:28 +0100
Subject: [PATCH 8/8] Update to 3.30.5

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 328eb9d..93419f8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.4
+Version: 3.30.5
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -520,6 +520,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Feb 04 2019 Milan Crha  - 3.30.5-1
+- Update to 3.30.5
+
 * Mon Jan 07 2019 Milan Crha  - 3.30.4-1
 - Update to 3.30.4
 
diff --git a/sources b/sources
index 9030da6..961e491 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.4.tar.xz) = 38b3e3cce219ad61e7f4b21f609ec259854f8d2bc60f44696171e5d5830014fd6730f34f8262eca2dc2212a001c51ff2d8dfb5df36a4c89240fbce54e1c4f826
+SHA512 (evolution-3.30.5.tar.xz) = 1d776fdb0da4166d9346ad4cd05d7ee050e0bf3ac1edc1f7d3fb4ba8909e35429e8d076a5b6e223f3fc94e2a8ad6337205c1d648220a3fdf593bae64d9c975d1