Update evolution-mapi to 3.12.1. Bring in and adapt the patch from evolution-mapi

to track the OpenChanges 2.1 API changes [1]. That revision patches the not
autotooled version, because of that we miss HAVE_FAST_TRANSFER_TAGS_2_1
so I disabled some defines  that did depend on that HAVE_TRANSFER_TAGS_2_1 in
 src/libexchangemapi/e-mapi-fast-transfer.c

Also bring pull in evo-mapi into the gnome3 build again. Bump gnome3 to
reflect this.

[1] commit 588b4ec9367a2


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@19608 df743ca5-7f9a-e211-a948-0013205c9059

11 files changed, 324 insertions, 68 deletions

diff --git a/mail/evolution-mapi/Makefile b/mail/evolution-mapi/Makefile
index 9815b83c5..a2bf77e41 100644
--- a/mail/evolution-mapi/Makefile
+++ b/mail/evolution-mapi/Makefile
@@ -1,9 +1,9 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/mail/evolution-mapi3/Makefile 18610 2013-06-30 16:33:05Z marcus $
+#   $MCom$
 
 PORTNAME=	evolution-mapi
-PORTVERSION=	3.6.3
+PORTVERSION=	3.12.1
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -11,22 +11,20 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Evolution plugin to connect to Microsoft Exchange servers
 
-BUILD_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution
+BUILD_DEPENDS=	itstool:${PORTSDIR}/textproc/itstool \
+		evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution
 LIB_DEPENDS=	libmapi.so:${PORTSDIR}/mail/libmapi
 RUN_DEPENDS=	evolution>=${EVO_VER}:${PORTSDIR}/mail/evolution
 
-BROKEN=		needs newer libmapi which needs samba4 update.
-
-EVO_VER=	3.6.3
-USE_XZ=		yes
-USES=		gettext gmake pkgconfig
-USE_GNOME=	gconf2
+USES=		gettext gmake libtool pkgconfig tar:xz
+USE_GNOME=	intltool
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS"=	-L${LOCALBASE}/lib
+CPPFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
+CFLAGS+=	-I${LOCALBASE}/include -Wno-error=format-nonliteral
+LDFLAGS+=	-L${LOCALBASE}/lib
 
-VERSION=	3.0
+VERSION=	3.12
 PLIST_SUB=	VERSION=${VERSION}
 
 post-patch:
diff --git a/mail/evolution-mapi/distinfo b/mail/evolution-mapi/distinfo
index 635d851bc..477c5ac59 100644
--- a/mail/evolution-mapi/distinfo
+++ b/mail/evolution-mapi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/evolution-mapi-3.4.4.tar.xz) = 0f98b4db0ced8437794db931a8b682ea4010dc27a408671a3dfbd4658f565007
-SIZE (gnome3/evolution-mapi-3.4.4.tar.xz) = 578900
+SHA256 (gnome3/evolution-mapi-3.12.1.tar.xz) = 764530f39fcb2f4851ddd79327a1341d1f2461a005442b1e4345ef88cbc82805
+SIZE (gnome3/evolution-mapi-3.12.1.tar.xz) = 591588
diff --git a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c b/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
deleted file mode 100644
index b4123235e..000000000
--- a/mail/evolution-mapi/files/patch-src_account-setup-eplugin_exchange-mapi-account-setup.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/account-setup-eplugin/exchange-mapi-account-setup.c.orig	2010-03-08 04:03:24.000000000 -0500
-+++ src/account-setup-eplugin/exchange-mapi-account-setup.c	2010-03-13 17:49:17.000000000 -0500
-@@ -696,3 +696,21 @@ exchange_mapi_cal_commit (EPlugin *epl, 
- 	// Update the folder list in the plugin and ExchangeMAPIFolder
- 	return;
- }
-+
-+const char *g_module_check_init (gpointer module);
-+const char *
-+g_module_check_init (gpointer module) {
-+	return NULL;
-+}
-+
-+void g_module_unload (gpointer module);
-+void
-+g_module_unload (gpointer module) {
-+	return;
-+}
-+
-+GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);
-+GtkWidget *
-+e_plugin_lib_get_configure_widget (EPlugin *plugin) {
-+	return NULL;
-+}
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
new file mode 100644
index 000000000..5b4856a41
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-cal-utils.c
@@ -0,0 +1,41 @@
+--- src/libexchangemapi/e-mapi-cal-utils.c.orig	2014-03-24 09:28:56.000000000 +0000
++++ src/libexchangemapi/e-mapi-cal-utils.c	2014-05-07 09:56:54.788424673 +0000
+@@ -462,6 +462,7 @@
+ 	gchar *start = NULL, *end = NULL;
+ 	time_t start_date, end_date;
+ 	icalcomponent *icalcomp = NULL;
++	int daylight;
+ 
+ 	if (!bin)
+ 		return;
+@@ -686,11 +687,10 @@
+ 		PidTagNickname,
+ 		PidTagRecipientDisplayName,
+ 		PidTagDisplayName,
+-		PidTag7BitDisplayName
++		PidTagAddressBookDisplayNamePrintable
+ 	};
+ 
+ 	const uint32_t email_proptags[] = {
+-		PidTagPrimarySmtpAddress,
+ 		PidTagSmtpAddress
+ 	};
+ 
+@@ -1352,7 +1352,6 @@
+ 		set_value (PidTagEmailAddress, email);
+ 
+ 		set_value (PidTagSmtpAddress, email);
+-		set_value (PidTagPrimarySmtpAddress, email);
+ 
+ 		ui32 = 0;
+ 		set_value (PidTagSendInternetEncoding, &ui32);
+@@ -1433,9 +1432,7 @@
+ 
+ 		set_value (PidTagAddressType, "SMTP");
+ 		set_value (PidTagEmailAddress, email);
+-
+ 		set_value (PidTagSmtpAddress, email);
+-		set_value (PidTagPrimarySmtpAddress, email);
+ 
+ 		ui32 = 0;
+ 		set_value (PidTagSendInternetEncoding, &ui32);
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c
new file mode 100644
index 000000000..3b5edc62c
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-connection.c
@@ -0,0 +1,22 @@
+diff --git a/src/libexchangemapi/e-mapi-connection.c b/src/libexchangemapi/e-mapi-connection.c
+index dc73408..5ae1aab 100644
+--- src/libexchangemapi/e-mapi-connection.c.orig
++++ src/libexchangemapi/e-mapi-connection.c
+@@ -3756,7 +3756,7 @@ add_object_recipients (EMapiConnection *conn,
+ 
+ 	count = 0;
+ 	for (recipient = recipients, ii = 0; recipient; recipient = recipient->next, ii++) {
+-		if (!e_mapi_util_find_array_propval (&recipient->properties, PidTagPrimarySmtpAddress)
++		if (!e_mapi_util_find_array_propval (&recipient->properties, PidTagSmtpAddress)
+ 		    && !e_mapi_util_find_array_propval (&recipient->properties, PidTagDisplayName))
+ 			g_debug ("%s: Cannot get email or display name for a recipient %d, skipping it", G_STRFUNC, ii);
+ 		else
+@@ -3777,7 +3777,7 @@ add_object_recipients (EMapiConnection *conn,
+ 	}
+ 
+ 	for (ii = 0, jj = 0, recipient = recipients; ii < count && recipient != NULL; ii++, recipient = recipient->next) {
+-		users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagPrimarySmtpAddress);
++		users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagSmtpAddress);
+ 		if (!users[ii])
+ 			users[ii] = e_mapi_util_find_array_propval (&recipient->properties, PidTagDisplayName);
+ 		if (!users[ii]) {
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-doc-utils.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-doc-utils.c
new file mode 100644
index 000000000..cb6443f7a
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-doc-utils.c
@@ -0,0 +1,40 @@
+diff --git a/src/libexchangemapi/e-mapi-book-utils.c b/src/libexchangemapi/e-mapi-book-utils.c
+index 99226ff..7b70669 100644
+--- src/libexchangemapi/e-mapi-book-utils.c.orig
++++ src/libexchangemapi/e-mapi-book-utils.c
+@@ -95,7 +95,7 @@ static const uint32_t extra_proptags[] = {
+ 	PidTagStateOrProvince,
+ 	PidTagPostalCode,
+ 	PidTagCountry,
+-	PidTagPrimarySmtpAddress,
++	PidTagSmtpAddress,
+ 	PidTagFolderId
+ };
+ 
+@@ -371,7 +371,7 @@ e_mapi_book_utils_contact_from_object (EMapiConnection *conn,
+ 
+ 	email_1 = e_contact_get (contact, E_CONTACT_EMAIL_1);
+ 	if (!email_1) {
+-		gconstpointer value = get_proptag (PidTagPrimarySmtpAddress);
++		gconstpointer value = get_proptag (PidTagSmtpAddress);
+ 
+ 		if (value)
+ 			e_contact_set (contact, E_CONTACT_EMAIL_1, value);
+@@ -1009,7 +1009,7 @@ func_eval_text_compare (struct _ESExp *f,
+ 				res->res.resOr.cRes = 4;
+ 				res->res.resOr.res = talloc_zero_array (esp->mem_ctx, struct mapi_SRestriction_or, res->res.resOr.cRes + 1);
+ 
+-				proptag = PidTagPrimarySmtpAddress;
++				proptag = PidTagSmtpAddress;
+ 				res->res.resOr.res[0].rt = RES_CONTENT;
+ 				res->res.resOr.res[0].res.resContent.fuzzy = fuzzy | FL_IGNORECASE;
+ 				res->res.resOr.res[0].res.resContent.ulPropTag = proptag;
+@@ -1115,7 +1115,7 @@ func_eval_field_exists (struct _ESExp *f,
+ 			res->res.resOr.res = talloc_zero_array (esp->mem_ctx, struct mapi_SRestriction_or, res->res.resOr.cRes + 1);
+ 
+ 			res->res.resOr.res[0].rt = RES_EXIST;
+-			res->res.resOr.res[0].res.resExist.ulPropTag = PidTagPrimarySmtpAddress;
++			res->res.resOr.res[0].res.resExist.ulPropTag = PidTagSmtpAddress;
+ 
+ 			for (ii = 1, jj = 0; emails[jj]; jj++) {
+ 				proptag = get_proptag_from_field_name (emails[jj], TRUE);
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-fast-transfer.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-fast-transfer.c
new file mode 100644
index 000000000..92ef19343
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-fast-transfer.c
@@ -0,0 +1,128 @@
+diff --git src/libexchangemapi/e-mapi-fast-transfer.c src/libexchangemapi/e-mapi-fast-transfer.c
+index 298839b..05fb207 100644
+--- src/libexchangemapi/e-mapi-fast-transfer.c
++++ src/libexchangemapi/e-mapi-fast-transfer.c
+@@ -30,6 +30,17 @@
+ 
+ #include "e-mapi-fast-transfer.h"
+ 
++#ifdef HAVE_FAST_TRANSFER_TAGS_2_1
++#define StartMessage PidTagStartMessage
++#define EndMessage PidTagEndMessage
++#define StartRecip PidTagStartRecip
++#define EndToRecip PidTagEndToRecip
++#define NewAttach PidTagNewAttach
++#define EndAttach PidTagEndAttach
++#define StartEmbed PidTagStartEmbed
++#define EndEmbed PidTagEndEmbed
++#endif
++
+ struct _EMapiFXParserClosure;
+ typedef struct _EMapiFXParserClosure EMapiFXParserClosure;
+ 
+@@ -107,9 +118,9 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 
+ 	/* g_print ("\tMarker: %s (0x%08x)\n", get_proptag_name (marker), marker); */
+ 	switch (marker) {
+-		case PidTagStartMessage:
++		case StartMessage:
+ 			if (data->object) {
+-				g_debug ("%s: PidTagStartMessage: out of order, previous object not finished yet", G_STRFUNC);
++				g_debug ("%s: StartMessage: out of order, previous object not finished yet", G_STRFUNC);
+ 				e_mapi_object_finish_read (data->object);
+ 				stop = !process_parsed_object (data);
+ 				e_mapi_object_free (data->object);
+@@ -134,9 +145,9 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 			data->current_streamed_properties_count = &data->object->streamed_properties_count;
+ 			data->marker = marker;
+ 			break;
+-		case PidTagEndMessage:
++		case EndMessage:
+ 			if (!data->object) {
+-				g_debug ("%s: PidTagEndMessage no object started", G_STRFUNC);
++				g_debug ("%s: EndMessage no object started", G_STRFUNC);
+ 			} else {
+ 				e_mapi_object_finish_read (data->object);
+ 				stop = !process_parsed_object (data);
+@@ -154,9 +165,9 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 			}
+ 			data->marker = 0;
+ 			break;
+-		case PidTagStartRecip:
++		case StartRecip:
+ 			if (!data->current_object) {
+-				g_debug ("%s: PidTagStartRecip no object started", G_STRFUNC);
++				g_debug ("%s: StartRecip no object started", G_STRFUNC);
+ 			} else {
+ 				EMapiRecipient *recipient;
+ 
+@@ -173,16 +184,16 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 			}
+ 			data->marker = marker;
+ 			break;
+-		case PidTagEndToRecip:
++		case EndToRecip:
+ 			data->current_properties = NULL;
+ 			data->current_streamed_mem_ctx = NULL;
+ 			data->current_streamed_properties = NULL;
+ 			data->current_streamed_properties_count = NULL;
+ 			data->marker = 0;
+ 			break;
+-		case PidTagNewAttach:
++		case NewAttach:
+ 			if (!data->current_object) {
+-				g_debug ("%s: PidTagNewAttach no object started", G_STRFUNC);
++				g_debug ("%s: NewAttach no object started", G_STRFUNC);
+ 			} else {
+ 				EMapiAttachment *attachment;
+ 
+@@ -199,20 +210,20 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 			}
+ 			data->marker = marker;
+ 			break;
+-		case PidTagEndAttach:
++		case EndAttach:
+ 			data->current_properties = NULL;
+ 			data->current_streamed_mem_ctx = NULL;
+ 			data->current_streamed_properties = NULL;
+ 			data->current_streamed_properties_count = NULL;
+ 			data->marker = 0;
+ 			break;
+-		case PidTagStartEmbed:
++		case StartEmbed:
+ 			if (!data->current_object) {
+-				g_debug ("%s: PidTagStartEmbed no object started", G_STRFUNC);
++				g_debug ("%s: StartEmbed no object started", G_STRFUNC);
+ 			} else if (!data->current_object->attachments) {
+-				g_debug ("%s: PidTagStartEmbed no attachment started", G_STRFUNC);
++				g_debug ("%s: StartEmbed no attachment started", G_STRFUNC);
+ 			} else if (data->current_object->attachments->embedded_object) {
+-				g_debug ("%s: PidTagStartEmbed attachment has embedded object already", G_STRFUNC);
++				g_debug ("%s: StartEmbed attachment has embedded object already", G_STRFUNC);
+ 			} else {
+ 				EMapiObject *object;
+ 
+@@ -228,11 +239,11 @@ parse_marker_cb (uint32_t marker, void *closure)
+ 			}
+ 			data->marker = marker;
+ 			break;
+-		case PidTagEndEmbed:
++		case EndEmbed:
+ 			if (!data->current_object) {
+-				g_debug ("%s: PidTagEndEmbed no object started", G_STRFUNC);
++				g_debug ("%s: EndEmbed no object started", G_STRFUNC);
+ 			} else if (!data->current_object->parent) {
+-				g_debug ("%s: PidTagEndEmbed no parent object", G_STRFUNC);
++				g_debug ("%s: EndEmbed no parent object", G_STRFUNC);
+ 			} else {
+ 				e_mapi_object_finish_read (data->current_object);
+ 				data->current_object = data->current_object->parent;
+@@ -397,7 +408,7 @@ e_mapi_fast_transfer_internal (EMapiConnection *conn,
+ 		data.current_streamed_mem_ctx = data.object;
+ 		data.current_streamed_properties = &data.object->streamed_properties;
+ 		data.current_streamed_properties_count = &data.object->streamed_properties_count;
+-		data.marker = PidTagStartMessage;
++		data.marker = StartMessage;
+ 	}
+ 		
+ 	parser = fxparser_init (data.mem_ctx, &data);
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-gal-user.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-gal-user.c
new file mode 100644
index 000000000..00bb3c497
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-gal-user.c
@@ -0,0 +1,33 @@
+diff --git a/src/configuration/e-mapi-search-gal-user.c b/src/configuration/e-mapi-search-gal-user.c
+index bc084be..1512d2a 100644
+--- src/configuration/e-mapi-search-gal-user.c.orig
++++ src/configuration/e-mapi-search-gal-user.c
+@@ -270,8 +270,8 @@ build_gal_search_restriction_cb (EMapiConnection *conn,
+ 
+ 	restriction->res.resOr.res[1].rt = RES_CONTENT;
+ 	restriction->res.resOr.res[1].res.resContent.fuzzy = FL_SUBSTRING | FL_IGNORECASE;
+-	restriction->res.resOr.res[1].res.resContent.ulPropTag = PidTagPrimarySmtpAddress;
+-	restriction->res.resOr.res[1].res.resContent.lpProp.ulPropTag = PidTagPrimarySmtpAddress;
++	restriction->res.resOr.res[1].res.resContent.ulPropTag = PidTagSmtpAddress;
++	restriction->res.resOr.res[1].res.resContent.lpProp.ulPropTag = PidTagSmtpAddress;
+ 	restriction->res.resOr.res[1].res.resContent.lpProp.value.lpszW = talloc_strdup (mem_ctx, search_text);
+ 
+ 	*restrictions = restriction;
+@@ -316,7 +316,7 @@ search_gal_build_properties_cb (EMapiConnection *conn,
+ 
+ 	SPropTagArray_add (mem_ctx, props, PidTagEntryId);
+ 	SPropTagArray_add (mem_ctx, props, PidTagDisplayName);
+-	SPropTagArray_add (mem_ctx, props, PidTagPrimarySmtpAddress);
++	SPropTagArray_add (mem_ctx, props, PidTagSmtpAddress);
+ 	SPropTagArray_add (mem_ctx, props, PidTagEmailAddress);
+ 
+ 	return TRUE;
+@@ -341,7 +341,7 @@ transfer_gal_search_objects_cb (EMapiConnection *conn,
+ 	g_return_val_if_fail (sid != NULL, FALSE);
+ 
+ 	display_name = e_mapi_util_find_array_propval (&object->properties, PidTagDisplayName);
+-	email = e_mapi_util_find_array_propval (&object->properties, PidTagPrimarySmtpAddress);
++	email = e_mapi_util_find_array_propval (&object->properties, PidTagSmtpAddress);
+ 	entry_id = e_mapi_util_find_array_propval (&object->properties, PidTagEntryId);
+ 	user_dn = e_mapi_util_find_array_propval (&object->properties, PidTagEmailAddress);
+ 
diff --git a/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-mail-utils.c b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-mail-utils.c
new file mode 100644
index 000000000..5120497f7
--- /dev/null
+++ b/mail/evolution-mapi/files/patch-src_libexchange_e-mapi-mail-utils.c
@@ -0,0 +1,28 @@
+diff --git a/src/libexchangemapi/e-mapi-mail-utils.c b/src/libexchangemapi/e-mapi-mail-utils.c
+index 479777a..0622571 100644
+--- src/libexchangemapi/e-mapi-mail-utils.c.orig
++++ src/libexchangemapi/e-mapi-mail-utils.c
+@@ -112,11 +112,10 @@ e_mapi_mail_utils_decode_recipients (EMapiConnection *conn,
+ 		PidTagNickname,
+ 		PidTagDisplayName,
+ 		PidTagRecipientDisplayName,
+-		PidTag7BitDisplayName
++		PidTagAddressBookDisplayNamePrintable
+ 	};
+ 
+ 	const uint32_t email_proptags[] = {
+-		PidTagPrimarySmtpAddress,
+ 		PidTagSmtpAddress
+ 	};
+ 
+@@ -987,9 +986,7 @@ e_mapi_mail_add_recipients (EMapiObject *object,
+ 		if (email && *email) {
+ 			set_value (PidTagAddressType, "SMTP");
+ 			set_value (PidTagEmailAddress, email);
+-
+ 			set_value (PidTagSmtpAddress, email);
+-			set_value (PidTagPrimarySmtpAddress, email);
+ 		}
+ 
+ 		ui32 = 0;
+
diff --git a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c b/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
deleted file mode 100644
index 5801861bd..000000000
--- a/mail/evolution-mapi/files/patch-src_libexchangemapi_exchnage-mapi-cal-utils.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libexchangemapi/exchange-mapi-cal-utils.c.orig	2010-06-07 16:59:16.000000000 +0200
-+++ src/libexchangemapi/exchange-mapi-cal-utils.c	2010-06-07 17:01:25.000000000 +0200
-@@ -2175,6 +2175,7 @@ populate_freebusy_data (struct Binary_r 
- 	gchar *start = NULL, *end = NULL;
- 	time_t start_date, end_date;
- 	icalcomponent *icalcomp = NULL;
-+	int daylight = 0;
- 
- 	if (!bin)
- 		return;
diff --git a/mail/evolution-mapi/pkg-plist b/mail/evolution-mapi/pkg-plist
index eec67be24..f6a0e35b3 100644
--- a/mail/evolution-mapi/pkg-plist
+++ b/mail/evolution-mapi/pkg-plist
@@ -1,28 +1,27 @@
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-defs.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-folder.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-connection.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-utils.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-cal-utils.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-cal-tz-utils.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-cal-recur-utils.h
-include/evolution-data-server-%%VERSION%%/mapi/exchange-mapi-mail-utils.h
-include/evolution-data-server-%%VERSION%%/mapi/em-operation-queue.h
-lib/evolution/%%VERSION%%/plugins/org-gnome-exchange-mapi.eplug
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-mapi.so
-lib/evolution/%%VERSION%%/plugins/liborg-gnome-exchange-mapi.la
+include/evolution-data-server/mapi/e-mapi-book-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-recur-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-tz-utils.h
+include/evolution-data-server/mapi/e-mapi-cal-utils.h
+include/evolution-data-server/mapi/e-mapi-connection.h
+include/evolution-data-server/mapi/e-mapi-debug.h
+include/evolution-data-server/mapi/e-mapi-defs.h
+include/evolution-data-server/mapi/e-mapi-fast-transfer.h
+include/evolution-data-server/mapi/e-mapi-folder.h
+include/evolution-data-server/mapi/e-mapi-mail-utils.h
+include/evolution-data-server/mapi/e-mapi-operation-queue.h
+include/evolution-data-server/mapi/e-mapi-utils.h
+lib/evolution/%%VERSION%%/modules/module-mapi-configuration.so
 lib/evolution-data-server/addressbook-backends/libebookbackendmapi.so
-lib/evolution-data-server/addressbook-backends/libebookbackendmapi.la
 lib/evolution-data-server/calendar-backends/libecalbackendmapi.so
-lib/evolution-data-server/calendar-backends/libecalbackendmapi.la
 lib/evolution-data-server/camel-providers/libcamelmapi.urls
 lib/evolution-data-server/camel-providers/libcamelmapi.so
-lib/evolution-data-server/camel-providers/libcamelmapi.la
-lib/libexchangemapi-1.0.la
+lib/evolution-data-server/registry-modules/module-mapi-backend.so
 lib/libexchangemapi-1.0.so
 lib/libexchangemapi-1.0.so.0
+lib/libexchangemapi-1.0.so.0.0.0
 libdata/pkgconfig/libexchangemapi-1.0.pc
-share/evolution-data-server-%%VERSION%%/mapi/tz-mapi-to-ical
-share/evolution-data-server-%%VERSION%%/mapi/tz-ical-to-mapi
+share/evolution-data-server/mapi/tz-ical-to-mapi
+share/evolution-data-server/mapi/tz-mapi-to-ical
 share/locale/as/LC_MESSAGES/evolution-mapi.mo
 share/locale/ast/LC_MESSAGES/evolution-mapi.mo
 share/locale/bg/LC_MESSAGES/evolution-mapi.mo
@@ -36,6 +35,7 @@ share/locale/de/LC_MESSAGES/evolution-mapi.mo
 share/locale/el/LC_MESSAGES/evolution-mapi.mo
 share/locale/en@shaw/LC_MESSAGES/evolution-mapi.mo
 share/locale/en_GB/LC_MESSAGES/evolution-mapi.mo
+share/locale/eo/LC_MESSAGES/evolution-mapi.mo
 share/locale/es/LC_MESSAGES/evolution-mapi.mo
 share/locale/et/LC_MESSAGES/evolution-mapi.mo
 share/locale/eu/LC_MESSAGES/evolution-mapi.mo
@@ -82,8 +82,6 @@ share/locale/vi/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_CN/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_HK/LC_MESSAGES/evolution-mapi.mo
 share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
-@dirrm share/evolution-data-server-%%VERSION%%/mapi
-@dirrm include/evolution-data-server-%%VERSION%%/mapi
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/te/LC_MESSAGES
@@ -106,3 +104,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-mapi.mo
 @dirrmtry share/locale/ast
 @dirrmtry share/locale/as/LC_MESSAGES
 @dirrmtry share/locale/as
+@dirrm share/evolution-data-server/mapi
+@dirrm include/evolution-data-server/mapi