From 0357b3f61511faffe7c59044d7e9b778c49bd8d5 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Oct 30 2018 06:16:18 +0000
Subject: import evolution-data-server-3.28.5-1.el7


---

diff --git a/.evolution-data-server.metadata b/.evolution-data-server.metadata
index 3874026..eb6910f 100644
--- a/.evolution-data-server.metadata
+++ b/.evolution-data-server.metadata
@@ -1 +1 @@
-35dbf7b64ee2c501533ad98ff25396ae8b6a0472 SOURCES/evolution-data-server-3.22.7.tar.xz
+85025da5aeda52b9bb9506cb89c7985d1cb9083c SOURCES/evolution-data-server-3.28.5.tar.xz
diff --git a/.gitignore b/.gitignore
index 76f55fd..595c1b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/evolution-data-server-3.22.7.tar.xz
+SOURCES/evolution-data-server-3.28.5.tar.xz
diff --git a/SOURCES/evolution-data-server-1.11.5-fix-64bit-acinclude.patch b/SOURCES/evolution-data-server-1.11.5-fix-64bit-acinclude.patch
deleted file mode 100644
index 0ee2106..0000000
--- a/SOURCES/evolution-data-server-1.11.5-fix-64bit-acinclude.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -up evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude evolution-data-server-2.27.91/m4/evo_ldap_check.m4
---- evolution-data-server-2.27.91/m4/evo_ldap_check.m4.fix-64bit-acinclude	2009-08-24 12:45:52.000000000 +0200
-+++ evolution-data-server-2.27.91/m4/evo_ldap_check.m4	2009-08-24 12:48:08.000000000 +0200
-@@ -14,6 +14,18 @@ AC_DEFUN([EVO_LDAP_CHECK],[
- 		[AS_HELP_STRING([--with-static-ldap],
- 		[Link LDAP support statically into evolution])])
- 	AC_CACHE_CHECK([for OpenLDAP], [ac_cv_with_openldap], [ac_cv_with_openldap="${with_openldap:=$default}"])
-+
-+	AC_MSG_CHECKING(for multilib subdirectory)
-+	if test "$GCC" = "yes" ; then
-+		multilibsubdir=`$CC -print-multi-os-directory 2> /dev/null`
-+	fi
-+	multilibsubdir=${multilibsubdir:-.}
-+	AC_MSG_RESULT($multilibsubdir)
-+	AC_MSG_CHECKING(for lib subdirectory)
-+	libsubdir=`echo lib/${multilibsubdir} | sed -re 's,lib/../([[^/]]*),\1,g'`
-+	libsubdir=${libsubdir:-lib}
-+	AC_MSG_RESULT($libsubdir)
-+
- 	case $ac_cv_with_openldap in
- 	no|"")
- 		with_openldap=no
-@@ -24,7 +36,7 @@ AC_DEFUN([EVO_LDAP_CHECK],[
- 	*)
- 		with_openldap=$ac_cv_with_openldap
- 		LDAP_CFLAGS="-I$ac_cv_with_openldap/include"
--		LDAP_LDFLAGS="-L$ac_cv_with_openldap/lib"
-+		LDAP_LDFLAGS="-L$ac_cv_with_openldap/$libsubdir"
- 		;;
- 	esac
- 
-@@ -60,20 +72,20 @@ AC_DEFUN([EVO_LDAP_CHECK],[
- 		AC_CHECK_LIB(nsl, gethostbyaddr, [LDAP_LIBS="$LDAP_LIBS -lnsl"])
- 		AC_CHECK_LIB(lber, ber_get_tag, [
- 			if test "$with_static_ldap" = "yes"; then
--				LDAP_LIBS="$with_openldap/lib/liblber.a $LDAP_LIBS"
-+				LDAP_LIBS="$with_openldap/$libsubdir/liblber.a $LDAP_LIBS"
- 
- 				# libldap might depend on OpenSSL... We need to pull
- 				# in the dependency libs explicitly here since we're
- 				# not using libtool for the configure test.
--				if test -f $with_openldap/lib/libldap.la; then
--					LDAP_LIBS="`. $with_openldap/lib/libldap.la; echo $dependency_libs` $LDAP_LIBS"
-+				if test -f $with_openldap/$libsubdir/libldap.la; then
-+					LDAP_LIBS="`. $with_openldap/$libsubdir/libldap.la; echo $dependency_libs` $LDAP_LIBS"
- 				fi
- 			else
- 				LDAP_LIBS="-llber $LDAP_LIBS"
- 			fi
- 			AC_CHECK_LIB(ldap, ldap_open, [
- 					if test $with_static_ldap = "yes"; then
--						LDAP_LIBS="$with_openldap/lib/libldap.a $LDAP_LIBS"
-+						LDAP_LIBS="$with_openldap/$libsubdir/libldap.a $LDAP_LIBS"
- 					else
- 						LDAP_LIBS="-lldap $LDAP_LIBS"
- 					fi],
diff --git a/SOURCES/evolution-data-server-3.22.6-coverity-scan-issues.patch b/SOURCES/evolution-data-server-3.22.6-coverity-scan-issues.patch
deleted file mode 100644
index 92c7ff3..0000000
--- a/SOURCES/evolution-data-server-3.22.6-coverity-scan-issues.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff --git a/addressbook/backends/ldap/e-book-backend-ldap.c b/addressbook/backends/ldap/e-book-backend-ldap.c
-index 93d5f8a..8cb1cd8 100644
---- a/addressbook/backends/ldap/e-book-backend-ldap.c
-+++ b/addressbook/backends/ldap/e-book-backend-ldap.c
-@@ -3822,7 +3822,11 @@ e_book_backend_ldap_build_query (EBookBackendLDAP *bl,
- 	}
- 
- 	e_sexp_input_text (sexp, query, strlen (query));
--	e_sexp_parse (sexp);
-+	if (e_sexp_parse (sexp) == -1) {
-+		g_warning ("%s: Error in parsing '%s': %s", G_STRFUNC, query, e_sexp_get_error (sexp));
-+		g_object_unref (sexp);
-+		return NULL;
-+	}
- 
- 	r = e_sexp_eval (sexp);
- 
-diff --git a/addressbook/libebook-contacts/e-book-query.c b/addressbook/libebook-contacts/e-book-query.c
-index 3604bae..38a3ec3 100644
---- a/addressbook/libebook-contacts/e-book-query.c
-+++ b/addressbook/libebook-contacts/e-book-query.c
-@@ -777,6 +777,7 @@ e_book_query_from_string (const gchar *query_string)
- 
- 	if (e_sexp_parse (sexp) == -1) {
- 		g_warning ("%s: Error in parsing: %s", G_STRFUNC, e_sexp_get_error (sexp));
-+		g_object_unref (sexp);
- 		return NULL;
- 	}
- 
-diff --git a/addressbook/libedata-book/e-book-backend-sqlitedb.c b/addressbook/libedata-book/e-book-backend-sqlitedb.c
-index 2f51d2d..18568c8 100644
---- a/addressbook/libedata-book/e-book-backend-sqlitedb.c
-+++ b/addressbook/libedata-book/e-book-backend-sqlitedb.c
-@@ -3318,6 +3318,7 @@ e_book_backend_sqlitedb_check_summary_query_locked (EBookBackendSqliteDB *ebsdb,
- 	if (esexp_error == -1) {
- 		if (invalid_query)
- 			*invalid_query = TRUE;
-+		g_object_unref (sexp);
- 
- 		return FALSE;
- 	}
-diff --git a/addressbook/libedata-book/e-book-backend-summary.c b/addressbook/libedata-book/e-book-backend-summary.c
-index 2275548..ba59c9f 100644
---- a/addressbook/libedata-book/e-book-backend-summary.c
-+++ b/addressbook/libedata-book/e-book-backend-summary.c
-@@ -1273,6 +1273,7 @@ e_book_backend_summary_search (EBookBackendSummary *summary,
- 	esexp_error = e_sexp_parse (sexp);
- 
- 	if (esexp_error == -1) {
-+		g_object_unref (sexp);
- 		return NULL;
- 	}
- 
-diff --git a/camel/camel-db.c b/camel/camel-db.c
-index f21c359..71b06a6 100644
---- a/camel/camel-db.c
-+++ b/camel/camel-db.c
-@@ -2263,7 +2263,7 @@ cdb_delete_ids (CamelDB *cdb,
-                 GError **error)
- {
- 	gchar *tmp;
--	gint ret = 0;
-+	gint ret;
- 	gboolean first = TRUE;
- 	GString *str = g_string_new ("DELETE FROM ");
- 	GList *iterator;
-@@ -2294,7 +2294,7 @@ cdb_delete_ids (CamelDB *cdb,
- 
- 	g_string_append (str, ")");
- 
--	ret = ret == -1 ? ret : camel_db_add_to_transaction (cdb, str->str, error);
-+	ret = camel_db_add_to_transaction (cdb, str->str, error);
- 
- 	if (ret == -1)
- 		camel_db_abort_transaction (cdb, NULL);
-diff --git a/libedataserverui/e-webdav-discover-widget.c b/libedataserverui/e-webdav-discover-widget.c
-index 984455f..3fe9dc7 100644
---- a/libedataserverui/e-webdav-discover-widget.c
-+++ b/libedataserverui/e-webdav-discover-widget.c
-@@ -646,7 +646,7 @@ e_webdav_discover_content_trust_prompt_done_cb (GObject *source_object,
- 			e_webdav_discover_content_refresh_done_cb, rd);
- 	} else {
- 		g_cancellable_cancel (rd->cancellable);
--		g_cancellable_set_error_if_cancelled (rd->cancellable, &local_error);
-+		g_warn_if_fail (g_cancellable_set_error_if_cancelled (rd->cancellable, &local_error));
- 		g_simple_async_result_take_error (rd->simple, local_error);
- 		local_error = NULL;
- 		g_simple_async_result_complete (rd->simple);
-diff --git a/tools/addressbook-export/addressbook-export.c b/tools/addressbook-export/addressbook-export.c
-index 7c19614..0ce10b0 100644
---- a/tools/addressbook-export/addressbook-export.c
-+++ b/tools/addressbook-export/addressbook-export.c
-@@ -80,7 +80,7 @@ action_list_folders_init (ActionContext *p_actctx)
- 		EBookClient *book_client;
- 		EBookQuery *query;
- 		ESource *source;
--		GSList *contacts;
-+		GSList *contacts = NULL;
- 		const gchar *display_name;
- 		const gchar *uid;
- 		gchar *query_str;
-@@ -110,8 +110,8 @@ action_list_folders_init (ActionContext *p_actctx)
- 		query_str = e_book_query_to_string (query);
- 		e_book_query_unref (query);
- 
--		e_book_client_get_contacts_sync (
--			book_client, query_str, &contacts, NULL, NULL);
-+		if (!e_book_client_get_contacts_sync (book_client, query_str, &contacts, NULL, NULL))
-+			contacts = NULL;
- 
- 		display_name = e_source_get_display_name (source);
- 		uid = e_source_get_uid (source);
-@@ -125,9 +125,7 @@ action_list_folders_init (ActionContext *p_actctx)
- 				"\"%s\",\"%s\",%d\n",
- 				uid, display_name, g_slist_length (contacts));
- 
--		g_slist_foreach (contacts, (GFunc) g_object_unref, NULL);
--		g_slist_free (contacts);
--
-+		g_slist_free_full (contacts, g_object_unref);
- 		g_object_unref (book_client);
- 	}
- 
-@@ -806,7 +804,7 @@ action_list_cards_init (ActionContext *p_actctx)
- 	EBookClient *book_client;
- 	EBookQuery *query;
- 	ESource *source;
--	GSList *contacts;
-+	GSList *contacts = NULL;
- 	const gchar *uid;
- 	gchar *query_str;
- 	GError *error = NULL;
-@@ -853,13 +851,11 @@ action_list_cards_init (ActionContext *p_actctx)
- 	query_str = e_book_query_to_string (query);
- 	e_book_query_unref (query);
- 
--	e_book_client_get_contacts_sync (
--		book_client, query_str, &contacts, NULL, &error);
--
--	action_list_cards (contacts, p_actctx);
-+	if (e_book_client_get_contacts_sync (book_client, query_str, &contacts, NULL, &error)) {
-+		action_list_cards (contacts, p_actctx);
-+		g_slist_free_full (contacts, g_object_unref);
-+	}
- 
--	g_slist_foreach (contacts, (GFunc) g_object_unref, NULL);
--	g_slist_free (contacts);
- 	g_object_unref (book_client);
- 
- 	if (error != NULL) {
diff --git a/SOURCES/evolution-data-server-3.22.6-maybe-uninitialized-variable.patch b/SOURCES/evolution-data-server-3.22.6-maybe-uninitialized-variable.patch
deleted file mode 100644
index 411a876..0000000
--- a/SOURCES/evolution-data-server-3.22.6-maybe-uninitialized-variable.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c.maybe-uninitialized-variable evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c
---- evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c.maybe-uninitialized-variable	2017-03-14 15:24:48.131584612 +0100
-+++ evolution-data-server-3.22.6/camel/providers/pop3/camel-pop3-folder.c	2017-03-14 15:25:42.541580816 +0100
-@@ -409,7 +409,7 @@ pop3_folder_get_message_internal_sync (C
- 	CamelPOP3Command *pcr;
- 	CamelPOP3FolderInfo *fi;
- 	gchar buffer[1];
--	gint i, last;
-+	gint i = -1, last;
- 	CamelStream *stream = NULL;
- 	CamelService *service;
- 	CamelSettings *settings;
diff --git a/SOURCES/evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch b/SOURCES/evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch
deleted file mode 100644
index ddb2cd5..0000000
--- a/SOURCES/evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -up evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c
---- evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c.caldav-oauth2-refresh-deadlock	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/calendar/backends/caldav/e-cal-backend-caldav.c	2017-04-10 10:58:07.970110715 +0200
-@@ -362,6 +362,7 @@ caldav_ensure_bearer_auth_usage (ECalBac
- 
- static gboolean
- caldav_setup_bearer_auth (ECalBackendCalDAV *cbdav,
-+			  gboolean is_in_authenticate,
- 			  ESoupAuthBearer *bearer,
- 			  GCancellable *cancellable,
- 			  GError **error)
-@@ -381,7 +382,8 @@ caldav_setup_bearer_auth (ECalBackendCal
- 
- 	if (success) {
- 		e_soup_auth_bearer_set_access_token (bearer, access_token, expires_in_seconds);
--		caldav_ensure_bearer_auth_usage (cbdav, bearer);
-+		if (!is_in_authenticate)
-+			caldav_ensure_bearer_auth_usage (cbdav, bearer);
- 	}
- 
- 	g_free (access_token);
-@@ -419,7 +421,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa
- 	g_free (auth_method);
- 
- 	if (cbdav->priv->using_bearer_auth) {
--		success = caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, error);
-+		success = caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, error);
- 	} else {
- 		ESourceWebdav *extension;
- 		SoupAuth *soup_auth;
-@@ -432,7 +434,7 @@ caldav_maybe_prepare_bearer_auth (ECalBa
- 			E_TYPE_SOUP_AUTH_BEARER,
- 			SOUP_AUTH_HOST, soup_uri->host, NULL);
- 
--		success = caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error);
-+		success = caldav_setup_bearer_auth (cbdav, FALSE, E_SOUP_AUTH_BEARER (soup_auth), cancellable, error);
- 		if (success)
- 			cbdav->priv->using_bearer_auth = g_object_ref (soup_auth);
- 
-@@ -1134,7 +1136,7 @@ soup_authenticate_bearer (SoupSession *s
- {
- 	GError *local_error = NULL;
- 
--	caldav_setup_bearer_auth (cbdav, E_SOUP_AUTH_BEARER (auth), NULL, &local_error);
-+	caldav_setup_bearer_auth (cbdav, TRUE, E_SOUP_AUTH_BEARER (auth), NULL, &local_error);
- 
- 	/* Stash the error to be picked up by caldav_credentials_required_sync().
- 	 * There's no way to explicitly propagate a GError directly
-@@ -1266,7 +1268,7 @@ send_and_handle_redirection (ECalBackend
- 	    e_soup_auth_bearer_is_expired (cbdav->priv->using_bearer_auth)) {
- 		GError *local_error = NULL;
- 
--		if (!caldav_setup_bearer_auth (cbdav, cbdav->priv->using_bearer_auth, cancellable, &local_error)) {
-+		if (!caldav_setup_bearer_auth (cbdav, FALSE, cbdav->priv->using_bearer_auth, cancellable, &local_error)) {
- 			if (local_error) {
- 				soup_message_set_status_full (msg, SOUP_STATUS_BAD_REQUEST, local_error->message);
- 				g_propagate_error (error, local_error);
diff --git a/SOURCES/evolution-data-server-3.22.7-correct-libecal-tests.patch b/SOURCES/evolution-data-server-3.22.7-correct-libecal-tests.patch
deleted file mode 100644
index 3650aa2..0000000
--- a/SOURCES/evolution-data-server-3.22.7-correct-libecal-tests.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From 3f638b527fc46625d9dc791a07eea573c66f5d3c Mon Sep 17 00:00:00 2001
-From: Milan Crha <mcrha@redhat.com>
-Date: Mon, 10 Apr 2017 21:02:53 +0200
-Subject: Correct two libecal/client tests
-
-The main loop should be passed always as a user_data, because
-the function called from the callback expects it and there is
-no guarantee in which order the callbacks will be called.
-
-diff --git a/tests/libecal/client/test-cal-client-get-view.c b/tests/libecal/client/test-cal-client-get-view.c
-index 47514cc..2280646 100644
---- a/tests/libecal/client/test-cal-client-get-view.c
-+++ b/tests/libecal/client/test-cal-client-get-view.c
-@@ -206,7 +206,7 @@ test_get_view_sync (ETestServerFixture *fixture,
- 	g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
- 	g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
- 	g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
--	g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
-+	g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
- 
- 	e_cal_client_view_set_fields_of_interest (view, NULL, &error);
- 	if (error)
-diff --git a/tests/libecal/client/test-cal-client-revision-view.c b/tests/libecal/client/test-cal-client-revision-view.c
-index 0e25114..fdb386c 100644
---- a/tests/libecal/client/test-cal-client-revision-view.c
-+++ b/tests/libecal/client/test-cal-client-revision-view.c
-@@ -250,7 +250,7 @@ test_get_revision_view_sync (ETestServerFixture *fixture,
- 	g_signal_connect (view, "objects_added", G_CALLBACK (objects_added_cb), fixture->loop);
- 	g_signal_connect (view, "objects_modified", G_CALLBACK (objects_modified_cb), fixture->loop);
- 	g_signal_connect (view, "objects_removed", G_CALLBACK (objects_removed_cb), fixture->loop);
--	g_signal_connect (view, "complete", G_CALLBACK (complete_cb), NULL);
-+	g_signal_connect (view, "complete", G_CALLBACK (complete_cb), fixture->loop);
- 
- 	field_list = g_slist_prepend (NULL, (gpointer) "UID");
- 	field_list = g_slist_prepend (field_list, (gpointer) "RECURRENCE-ID");
diff --git a/SOURCES/evolution-data-server-3.22.7-deadlock-categories-finalize.patch b/SOURCES/evolution-data-server-3.22.7-deadlock-categories-finalize.patch
deleted file mode 100644
index 09b2795..0000000
--- a/SOURCES/evolution-data-server-3.22.7-deadlock-categories-finalize.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -up evolution-data-server-3.22.7/libedataserver/e-categories.c.deadlock-categories-finalize evolution-data-server-3.22.7/libedataserver/e-categories.c
---- evolution-data-server-3.22.7/libedataserver/e-categories.c.deadlock-categories-finalize	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/libedataserver/e-categories.c	2017-10-19 17:44:13.306338284 +0200
-@@ -224,8 +224,9 @@ hash_to_xml_string (gpointer key,
- 	g_string_append_len (string, "/>\n", 3);
- }
- 
--static gboolean
--idle_saver_cb (gpointer user_data)
-+/* Called with the @categories lock locked */
-+static void
-+idle_saver_save (void)
- {
- 	GString *buffer;
- 	gchar *contents;
-@@ -234,8 +235,6 @@ idle_saver_cb (gpointer user_data)
- 	EChangedListener *emit_listeners = NULL;  /* owned */
- 	GError *error = NULL;
- 
--	G_LOCK (categories);
--
- 	if (!save_is_pending)
- 		goto exit;
- 
-@@ -269,14 +268,26 @@ idle_saver_cb (gpointer user_data)
- exit:
- 	idle_id = 0;
- 
--	G_UNLOCK (categories);
--
- 	/* Emit the signal with the lock released to avoid re-entrancy
- 	 * deadlocks. Hold a reference to @listeners until this is complete. */
- 	if (emit_listeners) {
-+		G_UNLOCK (categories);
-+
- 		g_signal_emit_by_name (emit_listeners, "changed");
- 		g_object_unref (emit_listeners);
-+
-+		G_LOCK (categories);
- 	}
-+}
-+
-+static gboolean
-+idle_saver_cb (gpointer user_data)
-+{
-+	G_LOCK (categories);
-+
-+	idle_saver_save ();
-+
-+	G_UNLOCK (categories);
- 
- 	return FALSE;
- }
-@@ -462,7 +473,7 @@ finalize_categories (void)
- 	G_LOCK (categories);
- 
- 	if (save_is_pending)
--		idle_saver_cb (NULL);
-+		idle_saver_save ();
- 
- 	if (idle_id > 0) {
- 		g_source_remove (idle_id);
diff --git a/SOURCES/evolution-data-server-3.22.7-goa-prefer-ssl.patch b/SOURCES/evolution-data-server-3.22.7-goa-prefer-ssl.patch
deleted file mode 100644
index a8b96ca..0000000
--- a/SOURCES/evolution-data-server-3.22.7-goa-prefer-ssl.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-diff -up evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-prefer-ssl evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c
---- evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c.goa-prefer-ssl	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/modules/gnome-online-accounts/module-gnome-online-accounts.c	2017-10-19 17:31:45.489348625 +0200
-@@ -392,13 +392,11 @@ gnome_online_accounts_config_imap (EGnom
- 		CAMEL_NETWORK_SETTINGS (settings),
- 		goa_mail_get_imap_user_name (goa_mail));
- 
--	/* Prefer "use_tls" over "use_ssl" if both are set. */
-+	/* Prefer "use_ssl" over "use_tls" if both are set. */
- 	camel_network_settings_set_security_method (
- 		CAMEL_NETWORK_SETTINGS (settings),
--		use_tls ?
--		CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
--		use_ssl ?
--		CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
-+		use_ssl ? CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
-+		use_tls ? CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
- 		CAMEL_NETWORK_SECURITY_METHOD_NONE);
- 
- 	g_object_unref (network_address);
-@@ -477,13 +475,11 @@ gnome_online_accounts_config_smtp (EGnom
- 		CAMEL_NETWORK_SETTINGS (settings),
- 		gnome_online_accounts_get_smtp_auth (goa_mail));
- 
--	/* Prefer "use_tls" over "use_ssl" if both are set. */
-+	/* Prefer "use_ssl" over "use_tls" if both are set. */
- 	camel_network_settings_set_security_method (
- 		CAMEL_NETWORK_SETTINGS (settings),
--		use_tls ?
--		CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
--		use_ssl ?
--		CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
-+		use_ssl ? CAMEL_NETWORK_SECURITY_METHOD_SSL_ON_ALTERNATE_PORT :
-+		use_tls ? CAMEL_NETWORK_SECURITY_METHOD_STARTTLS_ON_STANDARD_PORT :
- 		CAMEL_NETWORK_SECURITY_METHOD_NONE);
- 
- 	g_object_unref (network_address);
-diff -up evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c.goa-prefer-ssl evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c
---- evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c.goa-prefer-ssl	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/modules/google-backend/module-google-backend.c	2017-10-19 17:31:52.929348522 +0200
-@@ -49,8 +49,8 @@
- /* SMTP Configuration Details */
- #define GOOGLE_SMTP_BACKEND_NAME	"smtp"
- #define GOOGLE_SMTP_HOST		"smtp.googlemail.com"
--#define GOOGLE_SMTP_PORT		587
--#define GOOGLE_SMTP_SECURITY_METHOD	METHOD (STARTTLS_ON_STANDARD_PORT)
-+#define GOOGLE_SMTP_PORT		465
-+#define GOOGLE_SMTP_SECURITY_METHOD	METHOD (SSL_ON_ALTERNATE_PORT)
- 
- /* Contacts Configuration Details */
- #define GOOGLE_CONTACTS_BACKEND_NAME	"google"
diff --git a/SOURCES/evolution-data-server-3.22.7-gtype-init-workaround.patch b/SOURCES/evolution-data-server-3.22.7-gtype-init-workaround.patch
deleted file mode 100644
index 4955600..0000000
--- a/SOURCES/evolution-data-server-3.22.7-gtype-init-workaround.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -up evolution-data-server-3.22.7/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c.gtype-init-workaround evolution-data-server-3.22.7/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c
---- evolution-data-server-3.22.7/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/addressbook/libedata-book/evolution-addressbook-factory-subprocess.c	2017-11-14 11:40:44.056226796 +0100
-@@ -168,6 +168,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
- 	if (g_getenv ("EDS_TESTING") == NULL)
-diff -up evolution-data-server-3.22.7/calendar/libedata-cal/evolution-calendar-factory-subprocess.c.gtype-init-workaround evolution-data-server-3.22.7/calendar/libedata-cal/evolution-calendar-factory-subprocess.c
---- evolution-data-server-3.22.7/calendar/libedata-cal/evolution-calendar-factory-subprocess.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/calendar/libedata-cal/evolution-calendar-factory-subprocess.c	2017-11-14 11:40:44.056226796 +0100
-@@ -165,6 +165,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
- 	if (g_getenv ("EDS_TESTING") == NULL)
-diff -up evolution-data-server-3.22.7/libedataserver/e-source-registry.c.gtype-init-workaround evolution-data-server-3.22.7/libedataserver/e-source-registry.c
---- evolution-data-server-3.22.7/libedataserver/e-source-registry.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/libedataserver/e-source-registry.c	2017-11-14 11:40:44.056226796 +0100
-@@ -1758,6 +1758,8 @@ e_source_registry_new_sync (GCancellable
- 	 *     until GObject's type initialization deadlock issue is fixed.
- 	 *     Apparently only the synchronous instantiation is affected. */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- 	registry = source_registry_dup_uninitialized_singleton ();
- 
-diff -up evolution-data-server-3.22.7/services/evolution-addressbook-factory/evolution-addressbook-factory.c.gtype-init-workaround evolution-data-server-3.22.7/services/evolution-addressbook-factory/evolution-addressbook-factory.c
---- evolution-data-server-3.22.7/services/evolution-addressbook-factory/evolution-addressbook-factory.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/services/evolution-addressbook-factory/evolution-addressbook-factory.c	2017-11-14 11:40:44.056226796 +0100
-@@ -58,6 +58,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
- 	if (g_getenv ("EDS_TESTING") == NULL)
-diff -up evolution-data-server-3.22.7/services/evolution-calendar-factory/evolution-calendar-factory.c.gtype-init-workaround evolution-data-server-3.22.7/services/evolution-calendar-factory/evolution-calendar-factory.c
---- evolution-data-server-3.22.7/services/evolution-calendar-factory/evolution-calendar-factory.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/services/evolution-calendar-factory/evolution-calendar-factory.c	2017-11-14 11:40:44.056226796 +0100
-@@ -60,6 +60,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
- 	if (g_getenv ("EDS_TESTING") == NULL)
-diff -up evolution-data-server-3.22.7/services/evolution-source-registry/evolution-source-registry.c.gtype-init-workaround evolution-data-server-3.22.7/services/evolution-source-registry/evolution-source-registry.c
---- evolution-data-server-3.22.7/services/evolution-source-registry/evolution-source-registry.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/services/evolution-source-registry/evolution-source-registry.c	2017-11-14 11:40:44.056226796 +0100
-@@ -158,6 +158,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- #if defined (ENABLE_MAINTAINER_MODE) && defined (HAVE_GTK)
- 	if (g_getenv ("EDS_TESTING") == NULL)
-diff -up evolution-data-server-3.22.7/services/evolution-user-prompter/evolution-user-prompter.c.gtype-init-workaround evolution-data-server-3.22.7/services/evolution-user-prompter/evolution-user-prompter.c
---- evolution-data-server-3.22.7/services/evolution-user-prompter/evolution-user-prompter.c.gtype-init-workaround	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/services/evolution-user-prompter/evolution-user-prompter.c	2017-11-14 11:40:44.056226796 +0100
-@@ -52,6 +52,8 @@ main (gint argc,
- 
- 	/* Workaround https://bugzilla.gnome.org/show_bug.cgi?id=674885 */
- 	g_type_ensure (G_TYPE_DBUS_CONNECTION);
-+	g_type_ensure (G_TYPE_DBUS_PROXY);
-+	g_type_ensure (G_BUS_TYPE_SESSION);
- 
- 	prompt_user_init (&argc, &argv);
- 
diff --git a/SOURCES/evolution-data-server-3.22.7-imapx-idle-server-leak.patch b/SOURCES/evolution-data-server-3.22.7-imapx-idle-server-leak.patch
deleted file mode 100644
index 9666d50..0000000
--- a/SOURCES/evolution-data-server-3.22.7-imapx-idle-server-leak.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -up evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c.imapx-idle-server-leak evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c
---- evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c.imapx-idle-server-leak	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-server.c	2017-06-05 16:08:13.983713415 +0200
-@@ -6318,6 +6318,7 @@ imapx_server_run_idle_thread_cb (gpointe
- 	}
- 
- 	g_mutex_unlock (&is->priv->idle_lock);
-+	g_object_unref (is);
- 
- 	return FALSE;
- }
diff --git a/SOURCES/evolution-data-server-3.22.7-imapx-subscriptions.patch b/SOURCES/evolution-data-server-3.22.7-imapx-subscriptions.patch
deleted file mode 100644
index b9add06..0000000
--- a/SOURCES/evolution-data-server-3.22.7-imapx-subscriptions.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -up evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c.imapx-subscriptions evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c
---- evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c.imapx-subscriptions	2017-04-12 15:10:11.507183207 +0200
-+++ evolution-data-server-3.22.7/camel/providers/imapx/camel-imapx-store.c	2017-04-12 15:12:39.367181163 +0200
-@@ -1449,14 +1449,21 @@ imapx_store_remove_unknown_mailboxes_cb
- 	g_return_val_if_fail (CAMEL_IS_IMAPX_STORE (imapx_store), FALSE);
- 
- 	if (camel_imapx_mailbox_get_state (mailbox) == CAMEL_IMAPX_MAILBOX_STATE_CREATED) {
-+		CamelSettings *settings;
- 		CamelFolderInfo *fi;
- 		gchar *folder_path;
-+		gboolean use_subscriptions;
-+
-+		settings = camel_service_ref_settings (CAMEL_SERVICE (imapx_store));
-+		use_subscriptions = camel_imapx_settings_get_use_subscriptions (CAMEL_IMAPX_SETTINGS (settings));
-+		g_object_unref (settings);
- 
- 		folder_path = camel_imapx_mailbox_dup_folder_path (mailbox);
- 		fi = imapx_store_build_folder_info (imapx_store, folder_path,
- 			(CamelFolderInfoFlags) imapx_store_mailbox_attributes_to_flags (mailbox));
- 		camel_store_folder_created (CAMEL_STORE (imapx_store), fi);
--		camel_subscribable_folder_subscribed (CAMEL_SUBSCRIBABLE (imapx_store), fi);
-+		if ((fi->flags & CAMEL_STORE_INFO_FOLDER_SUBSCRIBED) != 0 || !use_subscriptions)
-+			camel_subscribable_folder_subscribed (CAMEL_SUBSCRIBABLE (imapx_store), fi);
- 		camel_folder_info_free (fi);
- 		g_free (folder_path);
- 	}
diff --git a/SOURCES/evolution-data-server-3.22.7-use-after-free-component-summary-set.patch b/SOURCES/evolution-data-server-3.22.7-use-after-free-component-summary-set.patch
deleted file mode 100644
index d50a7f4..0000000
--- a/SOURCES/evolution-data-server-3.22.7-use-after-free-component-summary-set.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -up evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c.use-after-free-component-summary-set evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c
---- evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c.use-after-free-component-summary-set	2017-03-20 10:07:46.000000000 +0100
-+++ evolution-data-server-3.22.7/calendar/libecal/e-cal-component.c	2017-04-12 12:37:17.319310071 +0200
-@@ -4468,7 +4468,7 @@ e_cal_component_get_summary (ECalCompone
- }
- 
- typedef struct {
--	const gchar *old_summary;
-+	gchar *old_summary;
- 	const gchar *new_summary;
- } SetAlarmDescriptionData;
- 
-@@ -4559,7 +4559,8 @@ e_cal_component_set_summary (ECalCompone
- 	g_return_if_fail (summary->value != NULL);
- 
- 	if (priv->summary.prop) {
--		sadd.old_summary = icalproperty_get_summary (priv->summary.prop);
-+		/* Make a copy, to avoid use-after-free */
-+		sadd.old_summary = g_strdup (icalproperty_get_summary (priv->summary.prop));
- 		icalproperty_set_summary (priv->summary.prop, (gchar *) summary->value);
- 	} else {
- 		sadd.old_summary = NULL;
-@@ -4589,6 +4590,8 @@ e_cal_component_set_summary (ECalCompone
- 	/* look for alarms that need a description */
- 	sadd.new_summary = summary->value;
- 	g_hash_table_foreach (priv->alarm_uid_hash, set_alarm_description_cb, &sadd);
-+
-+	g_free (sadd.old_summary);
- }
- 
- /**
diff --git a/SOURCES/evolution-data-server-3.28.2-cmake-version.patch b/SOURCES/evolution-data-server-3.28.2-cmake-version.patch
new file mode 100644
index 0000000..a85d0e0
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.2-cmake-version.patch
@@ -0,0 +1,62 @@
+diff -up evolution-data-server-3.28.2/CMakeLists.txt.cmake-version evolution-data-server-3.28.2/CMakeLists.txt
+--- evolution-data-server-3.28.2/CMakeLists.txt.cmake-version	2018-05-07 04:03:27.000000000 -0400
++++ evolution-data-server-3.28.2/CMakeLists.txt	2018-06-01 02:47:48.476438577 -0400
+@@ -1,12 +1,16 @@
+ # Evolution-Data-Server build script
+ 
+-cmake_minimum_required(VERSION 3.1)
+-cmake_policy(VERSION 3.1)
++cmake_minimum_required(VERSION 2.8)
++cmake_policy(VERSION 2.8)
+ 
+-project(evolution-data-server
+-	VERSION 3.28.5
+-	LANGUAGES C CXX)
+-set(CMAKE_CXX_STANDARD 14)
++project(evolution-data-server C CXX)
++set(PROJECT_VERSION_MAJOR 3)
++set(PROJECT_VERSION_MINOR 28)
++set(PROJECT_VERSION_PATCH 5)
++set(PROJECT_VERSION_TWEAK 0)
++set(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
++
++#set(CMAKE_CXX_STANDARD 14)
+ set(PROJECT_BUGREPORT "https://gitlab.gnome.org/GNOME/evolution-data-server/issues/")
+ 
+ # Base Version: This is for API/version tracking for things like
+diff -up evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake
+--- evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake.cmake-version	2018-06-01 02:55:49.695451836 -0400
++++ evolution-data-server-3.28.2/cmake/modules/FindIntltool.cmake	2018-06-01 02:56:39.955247217 -0400
+@@ -92,7 +92,7 @@ macro(intltool_add_pot_file_target)
+ 	endif(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL GETTEXT_PO_DIR)
+ 
+ 	add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${GETTEXT_PACKAGE}.pot
+-		COMMAND ${CMAKE_COMMAND} -E env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
++		COMMAND env INTLTOOL_EXTRACT="${INTLTOOL_EXTRACT}" XGETTEXT="${XGETTEXT}" srcdir=${CMAKE_CURRENT_SOURCE_DIR} ${INTLTOOL_UPDATE} --gettext-package ${GETTEXT_PACKAGE} --pot
+ 	)
+ 
+ 	add_custom_target(pot-file
+diff -up evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake
+--- evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake.cmake-version	2018-05-07 04:03:27.000000000 -0400
++++ evolution-data-server-3.28.2/cmake/modules/GObjectIntrospection.cmake	2018-06-01 02:58:26.538809013 -0400
+@@ -116,7 +116,7 @@ macro(gir_add_introspection gir)
+ 		file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${_gir_name}_files "${_gir_files}")
+ 
+ 		add_custom_command(
+-			COMMAND ${CMAKE_COMMAND} -E env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
++			COMMAND env "CC='${CMAKE_C_COMPILER}'" LDFLAGS=
+ 				${INTROSPECTION_SCANNER_ENV}
+ 				${G_IR_SCANNER}
+ 				${INTROSPECTION_SCANNER_ARGS}
+diff -up evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake.cmake-version evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake
+--- evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake.cmake-version	2018-06-01 02:55:38.599497013 -0400
++++ evolution-data-server-3.28.2/cmake/modules/GtkDoc.cmake	2018-06-01 02:56:22.587317927 -0400
+@@ -60,7 +60,7 @@ macro(add_gtkdoc _module _namespace _dep
+ 
+ 	set(_mkhtml_prefix "")
+ 	if(APPLE)
+-		set(_mkhtml_prefix "${CMAKE_COMMAND} -E env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
++		set(_mkhtml_prefix "env XML_CATALOG_FILES=\"/usr/local/etc/xml/catalog\"")
+ 	endif(APPLE)
+ 
+ 	add_custom_command(OUTPUT html/index.html
diff --git a/SOURCES/evolution-data-server-3.28.2-sqlite-deterministic.patch b/SOURCES/evolution-data-server-3.28.2-sqlite-deterministic.patch
new file mode 100644
index 0000000..b41d3a1
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.2-sqlite-deterministic.patch
@@ -0,0 +1,20 @@
+diff -up evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c.sqlite-deterministic evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c
+--- evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c.sqlite-deterministic	2018-06-18 10:48:43.000000000 +0200
++++ evolution-data-server-3.28.3/src/calendar/libedata-cal/e-cal-cache.c	2018-06-18 12:24:16.018228889 +0200
+@@ -1730,14 +1730,14 @@ ecc_init_sqlite_functions (ECalCache *ca
+ 
+ 	/* check_sexp(sexp_id, icalstring) */
+ 	ret = sqlite3_create_function (sqlitedb,
+-		"check_sexp", 2, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++		"check_sexp", 2, SQLITE_UTF8 /*| SQLITE_DETERMINISTIC*/,
+ 		cal_cache, ecc_check_sexp_func,
+ 		NULL, NULL);
+ 
+ 	if (ret == SQLITE_OK) {
+ 		/* negate(x) */
+ 		ret = sqlite3_create_function (sqlitedb,
+-			"negate", 1, SQLITE_UTF8 | SQLITE_DETERMINISTIC,
++			"negate", 1, SQLITE_UTF8 /*| SQLITE_DETERMINISTIC*/,
+ 			NULL, ecc_negate_func,
+ 			NULL, NULL);
+ 	}
diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec
index 48d76e1..c9e7f1b 100644
--- a/SPECS/evolution-data-server.spec
+++ b/SPECS/evolution-data-server.spec
@@ -1,29 +1,26 @@
 %define ldap_support 1
 %define static_ldap 0
 %define krb5_support 1
-%define nntp_support 1
 %define largefile_support 1
 
 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code
 %{!?with_docs: %global with_docs 1}
 
-%define glib2_version 2.50.3
-%define gtk3_version 3.22.9
+%define glib2_version 2.46.0
+%define gtk3_version 3.10.0
 %define gcr_version 3.4
 %define gtk_doc_version 1.9
 %define goa_version 3.8
-%define intltool_version 0.50.2-7
-%define libsecret_version 0.18.5
-%define libgdata_version 0.17.7
-%define libgweather_version 3.20.4
-%define libical_version 0.46
+%define intltool_version 0.35.5
+%define libsecret_version 0.5
+%define libgdata_version 0.10.0
+%define libgweather_version 3.5.0
+%define libical_version 2.0
 %define libsoup_version 2.42
 %define nss_version 3.14
 %define sqlite_version 3.5
-%define webkit2gtk_version 2.14.5
-%define json_glib_version 1.2.2
-
-%define eds_base_version 3.22
+%define webkit2gtk_version 2.11.91
+%define json_glib_version 1.0.4
 
 %define credential_modules_dir %{_libdir}/evolution-data-server/credential-modules
 %define camel_provider_dir %{_libdir}/evolution-data-server/camel-providers
@@ -34,18 +31,20 @@
 ### Abstract ###
 
 Name: evolution-data-server
-Version: 3.22.7
-Release: 8%{?dist}
+Version: 3.28.5
+Release: 1%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
 URL: https://wiki.gnome.org/Apps/Evolution
-BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
-Source: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz
 
 Provides: evolution-webcal = %{version}
 Obsoletes: evolution-webcal < 2.24.0
 
+# RH-bug #1362477
+Requires: pinentry-gtk
+
 %if 0%{?fedora}
 # From rhughes-f20-gnome-3-12 copr
 Obsoletes: compat-evolution-data-server310-libcamel < 3.12
@@ -53,50 +52,29 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
 
 ### Patches ###
 
-# RH bug #243296
-Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
-
-Patch02: evolution-data-server-3.22.6-maybe-uninitialized-variable.patch
-Patch03: evolution-data-server-3.22.6-coverity-scan-issues.patch
-
-# RH bug #1440643
-Patch04: evolution-data-server-3.22.7-caldav-oauth2-refresh-deadlock.patch
-
-Patch05: evolution-data-server-3.22.7-correct-libecal-tests.patch
-
-# RH bug #1441608
-Patch06: evolution-data-server-3.22.7-use-after-free-component-summary-set.patch
-
-# RH bug #1439590
-Patch07: evolution-data-server-3.22.7-imapx-subscriptions.patch
-
-# RH bug #1444075
-Patch08: evolution-data-server-3.22.7-imapx-idle-server-leak.patch
-
-# RH bug #1504071
-Patch09: evolution-data-server-3.22.7-goa-prefer-ssl.patch
-
-# RH bug #1476329
-Patch10: evolution-data-server-3.22.7-deadlock-categories-finalize.patch
-
-# RH bug #1512860
-Patch11: evolution-data-server-3.22.7-gtype-init-workaround.patch
+Patch02: evolution-data-server-3.28.2-cmake-version.patch
+Patch03: evolution-data-server-3.28.2-sqlite-deterministic.patch
 
 ### Dependencies ###
 
 Requires: dconf
+Requires: %{name}-langpacks = %{version}-%{release}
 
 ### Build Dependencies ###
 
+BuildRequires: cmake
+BuildRequires: gcc
+BuildRequires: gcc-c++
 BuildRequires: gettext
-BuildRequires: gnome-common
 BuildRequires: gperf
 BuildRequires: gtk-doc >= %{gtk_doc_version}
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: libdb-devel
-BuildRequires: libtool
+BuildRequires: perl
+BuildRequires: python
 BuildRequires: vala
 BuildRequires: vala-tools
+BuildRequires: sendmail
 BuildRequires: systemd
 
 BuildRequires: pkgconfig(gcr-3)  >= %{gcr_version}
@@ -120,11 +98,9 @@ BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
 BuildRequires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
 
 %if %{ldap_support}
+BuildRequires: openldap-devel >= 2.0.11
 %if %{static_ldap}
-BuildRequires: openldap-devel%{?_isa}
 BuildRequires: pkgconfig(openssl)
-%else
-BuildRequires: openldap-devel >= 2.0.11
 %endif
 %endif
 
@@ -157,6 +133,14 @@ Requires: pkgconfig(json-glib-1.0) >= %{json_glib_version}
 %description devel
 Development files needed for building things which link against %{name}.
 
+%package langpacks
+Summary: Translations for %{name}
+BuildArch: noarch
+Requires: %{name} = %{version}-%{release}
+
+%description langpacks
+This package contains translations for %{name}.
+
 %if %{with_docs}
 
 %package doc
@@ -190,23 +174,18 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q
 
-%patch01 -p1 -b .fix-64bit-acinclude
-%patch02 -p1 -b .maybe-uninitialized-variable
-%patch03 -p1 -b .coverity-scan-issues
-%patch04 -p1 -b .caldav-oauth2-refresh-deadlock
-%patch05 -p1 -b .correct-libecal-tests
-%patch06 -p1 -b .use-after-free-component-summary-set
-%patch07 -p1 -b .imapx-subscriptions
-%patch08 -p1 -b .imapx-idle-server-leak
-%patch09 -p1 -b .goa-prefer-ssl
-%patch10 -p1 -b .deadlock-categories-finalize
-%patch11 -p1 -b .gtype-init-workaround
+%patch02 -p1 -b .cmake-version
+%patch03 -p1 -b .sqlite-deterministic
 
 %build
+
+mkdir -p _build
+cd _build
+
 %if %{ldap_support}
 
 %if %{static_ldap}
-%define ldap_flags --with-openldap=yes --with-static-ldap
+%define ldap_flags -DWITH_OPENLDAP=ON -DWITH_STATIC_LDAP=ON
 # Set LIBS so that configure will be able to link with static LDAP libraries,
 # which depend on Cyrus SASL and OpenSSL.  XXX Is the "else" clause necessary?
 if pkg-config openssl ; then
@@ -222,37 +201,31 @@ else
     export LIBS="$LIBS -lssl3 -lsmime3 -lnss3 -lnssutil3 -lplds4 -lplc4 -lnspr4"
 fi
 %else
-%define ldap_flags --with-openldap=yes
+%define ldap_flags -DWITH_OPENLDAP=ON
 %endif
 
 %else
-%define ldap_flags --without-openldap
+%define ldap_flags -DWITH_OPENLDAP=OFF
 %endif
 
 %if %{krb5_support}
-%define krb5_flags --with-krb5
-%else
-%define krb5_flags --without-krb5
-%endif
-
-%if %{nntp_support}
-%define nntp_flags --enable-nntp=yes
+%define krb5_flags -DWITH_KRB5=ON
 %else
-%define nntp_flags --enable-nntp=no
+%define krb5_flags -DWITH_KRB5=OFF
 %endif
 
 %if %{largefile_support}
-%define largefile_flags --enable-largefile
+%define largefile_flags -DENABLE_LARGEFILE=ON
 %else
-%define largefile_flags --disable-largefile
+%define largefile_flags -DENABLE_LARGEFILE=OFF
 %endif
 
-%define ssl_flags --enable-smime=yes
+%define ssl_flags -DENABLE_SMIME=ON
 
 %if %{with_docs}
-%define gtkdoc_flags --enable-gtk-doc
+%define gtkdoc_flags -DENABLE_GTK_DOC=ON
 %else
-%define gtkdoc_flags --disable-gtk-doc
+%define gtkdoc_flags -DENABLE_GTK_DOC=OFF
 %endif
 
 if ! pkg-config --exists nss; then
@@ -263,54 +236,34 @@ fi
 export CPPFLAGS="-I%{_includedir}/et"
 export CFLAGS="$RPM_OPT_FLAGS -DLDAP_DEPRECATED -fPIC -I%{_includedir}/et -Wno-deprecated-declarations"
 
-# Regenerate configure to pick up configure.in and acinclude.m4 changes..
-aclocal -I m4
-autoheader
-automake --add-missing
-libtoolize
-intltoolize --force
-autoconf
-
 # See Ross Burton's blog entry for why we want --with-libdb.
 # http://www.burtonini.com/blog//computers/eds-libdb-2006-07-18-10-40
 
-%configure \
-	--disable-maintainer-mode \
-	--disable-uoa \
-	--with-libdb=/usr \
-	--enable-file-locking=fcntl \
-	--enable-dot-locking=no \
-	--enable-introspection=yes \
-	--enable-vala-bindings \
-	--enable-installed-tests \
-	%ldap_flags %krb5_flags %nntp_flags %ssl_flags \
-	%largefile_flags %gtkdoc_flags
-export tagname=CC
-
-make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool
+%cmake -G "Unix Makefiles" \
+	-DENABLE_MAINTAINER_MODE=OFF \
+	-DENABLE_UOA=OFF \
+	-DWITH_LIBDB=/usr \
+	-DENABLE_FILE_LOCKING=fcntl \
+	-DENABLE_DOT_LOCKING=OFF \
+	-DENABLE_INTROSPECTION=ON \
+	-DENABLE_VALA_BINDINGS=ON \
+	-DENABLE_INSTALLED_TESTS=ON \
+	%ldap_flags %krb5_flags %ssl_flags \
+	%largefile_flags %gtkdoc_flags \
+	..
+
+make %{?_smp_mflags}
 
 %install
+cd _build
 rm -rf $RPM_BUILD_ROOT
-export tagname=CC
-make DESTDIR=$RPM_BUILD_ROOT LIBTOOL=/usr/bin/libtool install
-
-# remove libtool archives for importers and the like
-find $RPM_BUILD_ROOT/%{_libdir} -name '*.la' -exec rm {} \;
-rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
-rm -f $RPM_BUILD_ROOT/%{_libdir}/evolution-data-server/*.a
-rm -f $RPM_BUILD_ROOT/%{credential_modules_dir}/*.a
-rm -f $RPM_BUILD_ROOT/%{camel_provider_dir}/*.a
-rm -f $RPM_BUILD_ROOT/%{ebook_backends_dir}/*.a
-rm -f $RPM_BUILD_ROOT/%{ecal_backends_dir}/*.a
-rm -f $RPM_BUILD_ROOT/%{modules_dir}/*.a
+
+make DESTDIR=$RPM_BUILD_ROOT install
 
 # give the libraries some executable bits
 find $RPM_BUILD_ROOT -name '*.so.*' -exec chmod +x {} \;
 
-%find_lang %{name}-%{eds_base_version}
-
-%clean
-rm -rf $RPM_BUILD_ROOT
+%find_lang %{name}
 
 %post -p /sbin/ldconfig
 
@@ -323,8 +276,9 @@ fi
 %posttrans
 glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 
-%files -f %{name}-%{eds_base_version}.lang
-%doc README COPYING ChangeLog NEWS
+%files
+%license COPYING
+%doc README ChangeLog NEWS
 %{_libdir}/libcamel-1.2.so.*
 %{_libdir}/libebackend-1.2.so.*
 %{_libdir}/libebook-1.2.so.*
@@ -335,9 +289,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libdir}/libedataserver-1.2.so.*
 %{_libdir}/libedataserverui-1.2.so.*
 
+%{_libdir}/girepository-1.0/Camel-1.2.typelib
 %{_libdir}/girepository-1.0/EBook-1.2.typelib
 %{_libdir}/girepository-1.0/EBookContacts-1.2.typelib
 %{_libdir}/girepository-1.0/EDataServer-1.2.typelib
+%{_libdir}/girepository-1.0/EDataServerUI-1.2.typelib
 
 %{_libexecdir}/camel-gpg-photo-saver
 %{_libexecdir}/camel-index-control-1.2
@@ -350,7 +306,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_libexecdir}/evolution-source-registry
 %{_libexecdir}/evolution-user-prompter
 
+%dir %{_libexecdir}/evolution-data-server
 %{_libexecdir}/evolution-data-server/addressbook-export
+%{_libexecdir}/evolution-data-server/list-sources
 
 # GSettings schemas:
 %{_datadir}/GConf/gsettings/evolution-data-server.convert
@@ -416,10 +374,11 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{modules_dir}/module-cache-reaper.so
 %{modules_dir}/module-google-backend.so
 %{modules_dir}/module-gnome-online-accounts.so
+%{modules_dir}/module-oauth2-services.so
 %{modules_dir}/module-outlook-backend.so
-%{modules_dir}/module-owncloud-backend.so
 %{modules_dir}/module-secret-monitor.so
 %{modules_dir}/module-trust-prompt.so
+%{modules_dir}/module-webdav-backend.so
 %{modules_dir}/module-yahoo-backend.so
 
 %files devel
@@ -447,6 +406,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/gir-1.0/EBook-1.2.gir
 %{_datadir}/gir-1.0/EBookContacts-1.2.gir
 %{_datadir}/gir-1.0/EDataServer-1.2.gir
+%{_datadir}/gir-1.0/EDataServerUI-1.2.gir
 %{_datadir}/vala/vapi/camel-1.2.deps
 %{_datadir}/vala/vapi/camel-1.2.vapi
 %{_datadir}/vala/vapi/libebook-1.2.deps
@@ -455,6 +415,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/vala/vapi/libebook-contacts-1.2.vapi
 %{_datadir}/vala/vapi/libedataserver-1.2.deps
 %{_datadir}/vala/vapi/libedataserver-1.2.vapi
+%{_datadir}/vala/vapi/libedataserverui-1.2.deps
+%{_datadir}/vala/vapi/libedataserverui-1.2.vapi
+
+%files langpacks -f _build/%{name}.lang
 
 %if %{with_docs}
 
@@ -473,6 +437,25 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Jul 30 2018 Milan Crha <mcrha@redhat.com> - 3.28.5-1
+- Update to 3.28.5
+
+* Mon Jul 16 2018 Milan Crha <mcrha@redhat.com> - 3.28.4-1
+- Update to 3.28.4
+- Remove patch for GNOME bug #796174 (fixed upstream)
+
+* Tue Jun 19 2018 Milan Crha <mcrha@redhat.com> - 3.28.3-2
+- Add patch for GNOME bug #796174 (strcat() considered unsafe for buffer overflow)
+
+* Mon Jun 18 2018 Milan Crha <mcrha@redhat.com> - 3.28.3-1
+- Update to 3.28.3
+- Remove patch for GNOME bug #795997 (fixed upstream)
+
+* Wed May 30 2018 Milan Crha <mcrha@redhat.com> - 3.28.2-1
+- Update to 3.28.2
+- Add patch for GNOME bug #795997 (Fails to parse Google OAuth2 authorization code)
+- Resolves: #1575495
+
 * Thu Nov 16 2017 Milan Crha <mcrha@redhat.com> - 3.22.7-8
 - Add patch for RH bug #1512860 (Add workaround for glib type init deadlock)