From 3930dc45cee001fc4e439607194fb4f999b3416d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Aug 06 2019 11:09:32 +0000 Subject: import evolution-3.28.5-5.el7 --- diff --git a/SOURCES/evolution-3.28.5-composer-extra-nl-url.patch b/SOURCES/evolution-3.28.5-composer-extra-nl-url.patch new file mode 100644 index 0000000..6486d36 --- /dev/null +++ b/SOURCES/evolution-3.28.5-composer-extra-nl-url.patch @@ -0,0 +1,66 @@ +diff -up evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-extra-nl-url evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c +--- evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-extra-nl-url 2018-11-09 13:34:49.430164229 +0100 ++++ evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c 2018-11-09 13:34:49.432164229 +0100 +@@ -1319,6 +1319,44 @@ test_issue_86 (TestFixture *fixture) + g_free (converted); + } + ++static void ++test_issue_103 (TestFixture *fixture) ++{ ++ #define LONG_URL "https://www.example.com/123456789012345678901234567890123456789012345678901234567890" ++ #define SHORTER_URL "https://www.example.com/1234567890123456789012345678901234567890" ++ #define SHORT_URL "https://www.example.com/" ++ ++ if (!test_utils_run_simple_test (fixture, ++ "mode:plain\n" ++ "type:before\\n" ++ LONG_URL "\\n" ++ "after\\n" ++ "prefix text " SHORTER_URL " suffix\\n" ++ "prefix " SHORT_URL " suffix\\n" ++ "end\n", ++ HTML_PREFIX "
before
" ++ "
" LONG_URL "
" ++ "
after
" ++ "
prefix text " SHORTER_URL " suffix
" ++ "
prefix " SHORT_URL " suffix
" ++ "
end
" ++ HTML_SUFFIX, ++ "before\n" ++ LONG_URL "\n" ++ "after\n" ++ "prefix text \n" ++ SHORTER_URL " suffix\n" ++ "prefix " SHORT_URL " suffix\n" ++ "end")) { ++ g_test_fail (); ++ return; ++ } ++ ++ #undef SHORT_URL ++ #undef SHORTER_URL ++ #undef LONG_URL ++} ++ + void + test_add_html_editor_bug_tests (void) + { +@@ -1349,4 +1387,5 @@ test_add_html_editor_bug_tests (void) + 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); ++ test_utils_add_test ("/issue/103", test_issue_103); + } +diff -up evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-extra-nl-url evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +--- evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-extra-nl-url 2018-11-09 13:34:49.431164229 +0100 ++++ evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c 2018-11-09 13:34:49.434164229 +0100 +@@ -14089,7 +14089,7 @@ wrap_lines (EEditorPage *editor_page, + + next_sibling = webkit_dom_node_get_next_sibling (node); + /* If the anchor doesn't fit on the line, add it to a separate line. */ +- if ((line_length + anchor_length) > length_to_wrap) { ++ if (line_length > 0 && (line_length + anchor_length) > length_to_wrap) { + /* Put
before the anchor, thus it starts on a new line */ + element = webkit_dom_document_create_element (document, "BR", NULL); + element_add_class (element, "-x-evo-wrap-br"); diff --git a/SOURCES/evolution-3.28.5-composer-mangled-quotation.patch b/SOURCES/evolution-3.28.5-composer-mangled-quotation.patch new file mode 100644 index 0000000..f0c281c --- /dev/null +++ b/SOURCES/evolution-3.28.5-composer-mangled-quotation.patch @@ -0,0 +1,338 @@ +diff -up evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-mangled-quotation evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c +--- evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c.composer-mangled-quotation 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/e-util/test-html-editor-units-bugs.c 2018-11-09 13:27:45.699170089 +0100 +@@ -1205,6 +1205,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) + { +@@ -1234,4 +1348,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 -up evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-mangled-quotation evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +--- evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c.composer-mangled-quotation 2018-07-30 15:37:05.000000000 +0200 ++++ evolution-3.28.5/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c 2018-11-09 13:29:06.551168971 +0100 +@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPag + WEBKIT_DOM_NODE (content_wrapper), + WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)), + NULL); +- + if (!cite_body) { + if (!empty) { + WebKitDOMNode *child; +@@ -8754,6 +8753,133 @@ adapt_to_editor_dom_changes (WebKitDOMDo + 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)
+ {
+@@ -8803,60 +8929,8 @@ e_editor_dom_process_content_after_load
+ 		}
+ 
+ 		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);
+ 	}
+ 
+ 	adapt_to_editor_dom_changes (document);
diff --git a/SOURCES/evolution-3.28.5-intltool-cache.patch b/SOURCES/evolution-3.28.5-intltool-cache.patch
new file mode 100644
index 0000000..2476af2
--- /dev/null
+++ b/SOURCES/evolution-3.28.5-intltool-cache.patch
@@ -0,0 +1,42 @@
+From f315ca6a601e77220323bff4ac7782b54c862a0c Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Tue, 30 Oct 2018 15:50:58 +0100
+Subject: [PATCH] Make sure intltool-merge cache is created only once
+
+Similar to https://gitlab.gnome.org/GNOME/evolution/issues/196
+when intltool-merge is called in parallel, it could either rewrite
+the ongoing attempt to build it or use an incomplete data, which
+results in broken output files (.desktop, .metainfo and so on).
+This change ensures the intltool-merge cache is created only once
+and any other requests which would use it will wait until it's created.
+---
+ cmake/modules/FindIntltool.cmake | 11 ++++++++++-
+ 1 file changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindIntltool.cmake b/cmake/modules/FindIntltool.cmake
+index 2cda2549eb..8e223e9d7f 100644
+--- a/cmake/modules/FindIntltool.cmake
++++ b/cmake/modules/FindIntltool.cmake
+@@ -176,9 +176,18 @@ macro(intltool_merge _in_filename _out_filename)
+ 			DEPENDS ${_in}
+ 		)
+ 	else(_has_no_translations)
++		if(NOT TARGET intltool-merge-cache)
++			add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/po/.intltool-merge-cache
++				COMMAND ${INTLTOOL_MERGE} ${_args} --quiet --cache="${CMAKE_BINARY_DIR}/po/.intltool-merge-cache" "${GETTEXT_PO_DIR}" "${_in}" "${_out}"
++				DEPENDS ${_in}
++			)
++			add_custom_target(intltool-merge-cache ALL
++				DEPENDS ${CMAKE_BINARY_DIR}/po/.intltool-merge-cache)
++		endif(NOT TARGET intltool-merge-cache)
++
+ 		add_custom_command(OUTPUT ${_out}
+ 			COMMAND ${INTLTOOL_MERGE} ${_args} --quiet --cache="${CMAKE_BINARY_DIR}/po/.intltool-merge-cache" "${GETTEXT_PO_DIR}" "${_in}" "${_out}"
+-			DEPENDS ${_in}
++			DEPENDS ${_in} intltool-merge-cache
+ 		)
+ 	endif(_has_no_translations)
+ endmacro(intltool_merge)
+-- 
+2.18.1
+
diff --git a/SOURCES/evolution-3.28.5-task-memo-list-deselect.patch b/SOURCES/evolution-3.28.5-task-memo-list-deselect.patch
new file mode 100644
index 0000000..99a7014
--- /dev/null
+++ b/SOURCES/evolution-3.28.5-task-memo-list-deselect.patch
@@ -0,0 +1,46 @@
+diff -up evolution-3.28.5/src/modules/calendar/e-cal-base-shell-sidebar.c.task-memo-list-deselect evolution-3.28.5/src/modules/calendar/e-cal-base-shell-sidebar.c
+--- evolution-3.28.5/src/modules/calendar/e-cal-base-shell-sidebar.c.task-memo-list-deselect	2018-07-30 15:37:05.000000000 +0200
++++ evolution-3.28.5/src/modules/calendar/e-cal-base-shell-sidebar.c	2019-03-07 17:47:19.948348049 +0100
+@@ -296,6 +296,7 @@ typedef struct _OpenClientData {
+ 	ECalBaseShellSidebar *sidebar;
+ 	ESource *source;
+ 	EClient *client;
++	gboolean was_cancelled;
+ } OpenClientData;
+ 
+ static void
+@@ -304,9 +305,14 @@ open_client_data_free (gpointer pdata)
+ 	OpenClientData *data = pdata;
+ 
+ 	if (data) {
++		/* To free the cancellable in the 'value' pair, which is useless now */
++		g_hash_table_insert (data->sidebar->priv->selected_uids,
++			g_strdup (e_source_get_uid (data->source)),
++			NULL);
++
+ 		if (data->client) {
+ 			g_signal_emit (data->sidebar, signals[CLIENT_OPENED], 0, data->client);
+-		} else {
++		} else if (!data->was_cancelled) {
+ 			ESourceSelector *selector = e_cal_base_shell_sidebar_get_selector (data->sidebar);
+ 			e_source_selector_unselect_source (selector, data->source);
+ 		}
+@@ -333,6 +339,7 @@ e_cal_base_shell_sidebar_open_client_thr
+ 	selector = E_CLIENT_SELECTOR (e_cal_base_shell_sidebar_get_selector (data->sidebar));
+ 	data->client = e_client_selector_get_client_sync (
+ 		selector, data->source, TRUE, (guint32) -1, cancellable, &local_error);
++	data->was_cancelled = g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_CANCELLED);
+ 
+ 	e_util_propagate_open_source_job_error (job_data, data->extension_name, local_error, error);
+ }
+@@ -350,6 +357,10 @@ e_cal_base_shell_sidebar_ensure_source_o
+ 	g_return_if_fail (E_IS_CAL_BASE_SHELL_SIDEBAR (sidebar));
+ 	g_return_if_fail (E_IS_SOURCE (source));
+ 
++	/* Skip it when it's already opening or opened */
++	if (g_hash_table_contains (sidebar->priv->selected_uids, e_source_get_uid (source)))
++		return;
++
+ 	shell_view = e_shell_sidebar_get_shell_view (E_SHELL_SIDEBAR (sidebar));
+ 
+ 	switch (e_cal_base_shell_view_get_source_type (shell_view)) {
diff --git a/SPECS/evolution.spec b/SPECS/evolution.spec
index 5db424c..6dc3805 100644
--- a/SPECS/evolution.spec
+++ b/SPECS/evolution.spec
@@ -1,5 +1,8 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 
+# 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 @@
 
 Name: evolution
 Version: 3.28.5
-Release: 2%{?dist}
+Release: 5%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -40,6 +43,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.28.5
+%endif
+
 %global eds_version %{version}
 
 ### Patches ###
@@ -49,6 +56,18 @@ Patch01: evolution-3.28.2-cmake-version.patch
 # RH-bug #1613813
 Patch02: evolution-3.28.5-config-lookup-crash.patch
 
+# RH bug #1624834
+Patch03: evolution-3.28.5-composer-mangled-quotation.patch
+
+# RH bug #1624866
+Patch04: evolution-3.28.5-composer-extra-nl-url.patch
+
+# RH bug #1634660
+Patch05: evolution-3.28.5-task-memo-list-deselect.patch
+
+# RH bug #1686614
+Patch06: evolution-3.28.5-intltool-cache.patch
+
 ## Dependencies ###
 
 Requires: evolution-data-server >= %{eds_version}
@@ -201,6 +220,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
@@ -209,12 +229,17 @@ Requires: %{name}%{?_isa} = %{version}-%{release}
 %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}
 
 %patch01 -p1 -b .cmake-version
 %patch02 -p1 -b .config-lookup-crash
+%patch03 -p1 -b .composer-mangled-quotation
+%patch04 -p1 -b .composer-extra-nl-url
+%patch05 -p1 -b .task-memo-list-deselect
+%patch06 -p1 -b .intltool-cache
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -246,16 +271,21 @@ 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_AUTOAR=OFF \
 	-DENABLE_YTNEF=OFF \
-	-DENABLE_INSTALLED_TESTS=ON \
 	..
 
 make %{?_smp_mflags}
@@ -517,11 +547,24 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{evo_plugin_dir}/liborg-gnome-pst-import.so
 %endif
 
+%if %{enable_installed_tests}
 %files tests
 %{_libexecdir}/%{name}/installed-tests
 %{_datadir}/installed-tests
+%endif
 
 %changelog
+* Fri Mar 08 2019 Milan Crha  - 3.28.5-5
+- Add patch for RH bug #1686614 (Make sure intltool-merge cache is created only once)
+
+* Thu Mar 07 2019 Milan Crha  - 3.28.5-4
+- Add patch for RH bug #1634660 (Deselects task/memo list when started in Calendar view)
+- Disable and obsolete tests subpackage (RH bug #1638479)
+
+* Fri Nov 09 2018 Milan Crha  - 3.28.5-3
+- Add patch for RH bug #1624834 (Quoting of plain text mail into HTML mode mangles deeper levels)
+- Add patch for RH bug #1624866 (Extra new line added in front of long URLs)
+
 * Thu Aug 23 2018 Milan Crha  - 3.28.5-2
 - Add patch for RH bug #1613813 (Crash under config_lookup_thread() at e-config-lookup.c:179)