Update to 1.1.2.

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

7 files changed, 278 insertions, 14 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index c3364dfca..68e82f4c5 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
@@ -15,7 +15,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The data backends for the Evolution integrated mail/PIM suite
 
-LIB_DEPENDS=	soup-2.2.7:${PORTSDIR}/devel/libsoup
+LIB_DEPENDS=	soup-2.2.7:${PORTSDIR}/devel/libsoup \
+		nss3.1:${PORTSDIR}/security/nss
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -25,7 +26,12 @@ USE_GNOME=	gnomeprefix gnomehack intlhack gnometarget libgnomeui
 USE_REINPLACE=	yes
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
-CONFIGURE_ARGS=	--enable-static
+CONFIGURE_ARGS=	--enable-static \
+		--with-nss-includes=${LOCALBASE}/include/nss/nss \
+		--with-nss-libs=${LOCALBASE}/lib \
+		--with-nspr-includes=${LOCALBASE}/include/nspr \
+		--with-nspr-libs=${LOCALBASE}/lib \
+		--with-krb5=/usr
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index 2b0fc4412..d480a3bd5 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/evolution-data-server-1.1.1.tar.bz2) = f1416224303d9274608b38e882549a46
-SIZE (gnome2/evolution-data-server-1.1.1.tar.bz2) = 5048155
+MD5 (gnome2/evolution-data-server-1.1.2.tar.bz2) = 63051ed958115ad7504dcd61c30aea81
+SIZE (gnome2/evolution-data-server-1.1.2.tar.bz2) = 5967544
diff --git a/databases/evolution-data-server/files/patch-camel_Makefile.in b/databases/evolution-data-server/files/patch-camel_Makefile.in
new file mode 100644
index 000000000..dfd4f33f6
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_Makefile.in
@@ -0,0 +1,11 @@
+--- camel/Makefile.in.orig	Tue Dec 21 13:46:00 2004
++++ camel/Makefile.in	Tue Dec 21 13:46:01 2004
+@@ -299,7 +299,7 @@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ 
+-SUBDIRS = . providers tests
++SUBDIRS = . providers
+ 
+ pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_in_files = camel.pc.in camel-provider.pc.in
diff --git a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
new file mode 100644
index 000000000..17bddca39
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
@@ -0,0 +1,24 @@
+--- camel/camel-net-utils.c.orig	Tue Dec 21 13:38:52 2004
++++ camel/camel-net-utils.c	Tue Dec 21 13:40:34 2004
+@@ -143,12 +143,21 @@
+ 	case EAI_SERVICE:
+ 		return NO_DATA;
+ 		break;
++#ifdef EAI_ADDRFAMILY
+ 	case EAI_ADDRFAMILY:
+ 		return NO_ADDRESS;
+ 		break;
++#endif
++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME
+ 	case EAI_NODATA:
+ 		return NO_DATA;
+ 		break;
++#endif
++#ifdef EAI_NOFAMILY
++	case EAI_NOFAMILY:
++		return NO_ADDRESS;
++		break;
++#endif
+ 	case EAI_MEMORY:
+ 		return ENOMEM;
+ 		break;
diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure
index 4959297da..7bc7a9cdf 100644
--- a/databases/evolution-data-server/files/patch-configure
+++ b/databases/evolution-data-server/files/patch-configure
@@ -1,6 +1,36 @@
---- configure.orig	Thu Jan 29 16:02:10 2004
-+++ configure	Thu Jan 29 16:02:39 2004
-@@ -23783,7 +23783,7 @@
+--- configure.orig	Tue Dec 21 13:46:01 2004
++++ configure	Tue Dec 21 13:50:02 2004
+@@ -7894,10 +7894,10 @@
+ Example: --with-nspr-libs=/usr/lib" >&2;}
+    { (exit 1); exit 1; }; }
+        				else
+-	       				nsprlibs="-ldl $with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
++	       				nsprlibs="$with_nspr_libs/libplc4.a $with_nspr_libs/libplds4.a $with_nspr_libs/libnspr4.a $PTHREAD_LIB"
+ 				fi
+ 			else
+-				nsprlibs="-ldl -lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
++				nsprlibs="-lplc4 -lplds4 -lnspr4 $PTHREAD_LIB"
+ 			fi
+ 
+ 			echo "$as_me:$LINENO: checking for Mozilla nspr libraries" >&5
+@@ -10011,6 +10011,7 @@
+ 		#include <sys/socket.h>
+ 		#include <netinet/in.h>
+ 		#include <netdb.h>
++		#include <stdio.h>
+ 
+ 
+ int
+@@ -10777,7 +10778,7 @@
+ 	LDFLAGS_save="$LDFLAGS"
+ 
+ 	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++	heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
+ 	echo "$as_me:$LINENO: checking for Kerberos 5" >&5
+ echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6
+ if test "${ac_cv_lib_kerberos5+set}" = set; then
+@@ -29833,7 +29834,7 @@
  idldir="$datadir/idl/evolution-data-server-$BASE_VERSION"
  
  
@@ -8,4 +38,4 @@
 +serverdir="$prefix/libdata/bonobo/servers"
  
  
- 
+ extensiondir='${privlibdir}'/extensions
diff --git a/databases/evolution-data-server/files/patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/patch-libedataserver_e-msgport.c
new file mode 100644
index 000000000..a82733daa
--- /dev/null
+++ b/databases/evolution-data-server/files/patch-libedataserver_e-msgport.c
@@ -0,0 +1,47 @@
+--- libedataserver/e-msgport.c.orig	Wed Jan 14 00:04:04 2004
++++ libedataserver/e-msgport.c	Sun Sep 19 14:01:25 2004
+@@ -921,9 +921,13 @@
+ void e_thread_put(EThread *e, EMsg *msg)
+ {
+ 	pthread_t id;
++	pthread_attr_t attr;
+ 	EMsg *dmsg = NULL;
+ 
+ 	pthread_mutex_lock(&e->mutex);
++	pthread_attr_init(&attr);
++	/* Give us a 1 MB thread stack size. */
++	pthread_attr_setstacksize(&attr, 0x100000);
+ 
+ 	/* the caller forgot to tell us what to do, well, we can't do anything can we */
+ 	if (e->received == NULL) {
+@@ -962,13 +966,14 @@
+ 		e_msgport_put(e->server_port, msg);
+ 		if (e->waiting == 0
+ 		    && g_list_length(e->id_list) < e->queue_limit
+-		    && pthread_create(&id, NULL, thread_dispatch, e) == 0) {
++		    && pthread_create(&id, &attr, thread_dispatch, e) == 0) {
+ 			struct _thread_info *info = g_malloc0(sizeof(*info));
+ 			t(printf("created NEW thread %ld\n", id));
+ 			info->id = id;
+ 			info->busy = TRUE;
+ 			e->id_list = g_list_append(e->id_list, info);
+ 		}
++		pthread_attr_destroy(&attr);
+ 		pthread_mutex_unlock(&e->mutex);
+ 		return;
+ 	}
+@@ -977,12 +982,13 @@
+ 	if (e->id == E_THREAD_NONE) {
+ 		int err;
+ 
+-		if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) {
++		if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) {
+ 			g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err));
+ 			e->id = E_THREAD_NONE;
+ 		}
+ 	}
+ 
++	pthread_attr_destroy(&attr);
+ 	pthread_mutex_unlock(&e->mutex);
+ 
+ 	if (dmsg) {
diff --git a/databases/evolution-data-server/pkg-plist b/databases/evolution-data-server/pkg-plist
index a98a1e523..8e73af808 100644
--- a/databases/evolution-data-server/pkg-plist
+++ b/databases/evolution-data-server/pkg-plist
@@ -1,3 +1,109 @@
+include/evolution-data-server-%%VERSION%%/camel/broken-date-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-arg.h
+include/evolution-data-server-%%VERSION%%/camel/camel-block-file.h
+include/evolution-data-server-%%VERSION%%/camel/camel-certdb.h
+include/evolution-data-server-%%VERSION%%/camel/camel-charset-map.h
+include/evolution-data-server-%%VERSION%%/camel/camel-cipher-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-data-wrapper.h
+include/evolution-data-server-%%VERSION%%/camel/camel-debug.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-digest-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-diary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-disco-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-exception-list.def
+include/evolution-data-server-%%VERSION%%/camel/camel-exception.h
+include/evolution-data-server-%%VERSION%%/camel/camel-file-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-driver.h
+include/evolution-data-server-%%VERSION%%/camel/camel-filter-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-search.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder-thread.h
+include/evolution-data-server-%%VERSION%%/camel/camel-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-gpg-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-http-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-i18n.h
+include/evolution-data-server-%%VERSION%%/camel/camel-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-internet-address.h
+include/evolution-data-server-%%VERSION%%/camel/camel-junk-plugin.h
+include/evolution-data-server-%%VERSION%%/camel/camel-list-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock-client.h
+include/evolution-data-server-%%VERSION%%/camel/camel-lock.h
+include/evolution-data-server-%%VERSION%%/camel/camel-medium.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-basic.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-bestenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-canon.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-charset.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-crlf.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-enriched.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-from.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-gzip.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-html.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-linewrap.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-save.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-tohtml.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-windows.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter-yenc.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-message.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-parser.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-part.h
+include/evolution-data-server-%%VERSION%%/camel/camel-mime-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-movemail.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-encrypted.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart-signed.h
+include/evolution-data-server-%%VERSION%%/camel/camel-multipart.h
+include/evolution-data-server-%%VERSION%%/camel/camel-net-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-object.h
+include/evolution-data-server-%%VERSION%%/camel/camel-operation.h
+include/evolution-data-server-%%VERSION%%/camel/camel-partition-table.h
+include/evolution-data-server-%%VERSION%%/camel/camel-provider.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-anonymous.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-cram-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-digest-md5.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-gssapi.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-kerberos4.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-login.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-ntlm.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-plain.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl-popb4smtp.h
+include/evolution-data-server-%%VERSION%%/camel/camel-sasl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-search-private.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-seekable-substream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-service.h
+include/evolution-data-server-%%VERSION%%/camel/camel-session.h
+include/evolution-data-server-%%VERSION%%/camel/camel-smime-context.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-buffer.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-filter.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-fs.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-mem.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-null.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream-process.h
+include/evolution-data-server-%%VERSION%%/camel/camel-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-string-utils.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-raw.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream-ssl.h
+include/evolution-data-server-%%VERSION%%/camel/camel-tcp-stream.h
+include/evolution-data-server-%%VERSION%%/camel/camel-text-index.h
+include/evolution-data-server-%%VERSION%%/camel/camel-transport.h
+include/evolution-data-server-%%VERSION%%/camel/camel-types.h
+include/evolution-data-server-%%VERSION%%/camel/camel-uid-cache.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url-scanner.h
+include/evolution-data-server-%%VERSION%%/camel/camel-url.h
+include/evolution-data-server-%%VERSION%%/camel/camel-utf8.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-store.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vee-summary.h
+include/evolution-data-server-%%VERSION%%/camel/camel-vtrash-folder.h
+include/evolution-data-server-%%VERSION%%/camel/camel.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-connection.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-container.h
 include/evolution-data-server-%%VERSION%%/groupwise/e-gw-filter.h
@@ -12,6 +118,7 @@ include/evolution-data-server-%%VERSION%%/libebook/e-book-view-listener.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book-view.h
 include/evolution-data-server-%%VERSION%%/libebook/e-book.h
 include/evolution-data-server-%%VERSION%%/libebook/e-contact.h
+include/evolution-data-server-%%VERSION%%/libebook/e-destination.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western-tables.h
 include/evolution-data-server-%%VERSION%%/libebook/e-name-western.h
 include/evolution-data-server-%%VERSION%%/libebook/e-vcard.h
@@ -53,19 +160,28 @@ include/evolution-data-server-%%VERSION%%/libedataserver/e-data-server-module.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-db3-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-dbhash.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-file-cache.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-iconv.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list-iterator.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-list.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-memory.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-msgport.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-sexp.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source-group.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source-list.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-source.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-time-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserver/e-trie.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-uid.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-url.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-util.h
 include/evolution-data-server-%%VERSION%%/libedataserver/e-xml-hash-utils.h
 include/evolution-data-server-%%VERSION%%/libedataserver/md5-utils.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-contact-store.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-destination-store.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-dialog.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-entry.h
+include/evolution-data-server-%%VERSION%%/libedataserverui/e-name-selector-model.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-option-menu.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector-dialog.h
 include/evolution-data-server-%%VERSION%%/libedataserverui/e-source-selector.h
@@ -113,6 +229,22 @@ include/evolution-data-server-%%VERSION%%/libical/sspm.h
 include/evolution-data-server-%%VERSION%%/libical/vcaltmp.h
 include/evolution-data-server-%%VERSION%%/libical/vcc.h
 include/evolution-data-server-%%VERSION%%/libical/vobject.h
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelgroupwise.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelimap4.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamellocal.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelnntp.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelpop3.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsendmail.urls
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.so
+lib/evolution-data-server-%%VERSION%%/camel-providers/libcamelsmtp.urls
 lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.a
 lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendfile.so
 lib/evolution-data-server-%%VERSION%%/extensions/libebookbackendgroupwise.a
@@ -129,9 +261,15 @@ lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.a
 lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendgroupwise.so
 lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.a
 lib/evolution-data-server-%%VERSION%%/extensions/libecalbackendhttp.so
+lib/libcamel-%%VERSION%%.a
+lib/libcamel-%%VERSION%%.so
+lib/libcamel-%%VERSION%%.so.0
+lib/libcamel-provider-%%VERSION%%.a
+lib/libcamel-provider-%%VERSION%%.so
+lib/libcamel-provider-%%VERSION%%.so.0
 lib/libebook-%%VERSION%%.a
 lib/libebook-%%VERSION%%.so
-lib/libebook-%%VERSION%%.so.1
+lib/libebook-%%VERSION%%.so.2
 lib/libecal-%%VERSION%%.a
 lib/libecal-%%VERSION%%.so
 lib/libecal-%%VERSION%%.so.0
@@ -140,17 +278,19 @@ lib/libedata-book-%%VERSION%%.so
 lib/libedata-book-%%VERSION%%.so.1
 lib/libedata-cal-%%VERSION%%.a
 lib/libedata-cal-%%VERSION%%.so
-lib/libedata-cal-%%VERSION%%.so.0
+lib/libedata-cal-%%VERSION%%.so.1
 lib/libedataserver-%%VERSION%%.a
 lib/libedataserver-%%VERSION%%.so
-lib/libedataserver-%%VERSION%%.so.0
+lib/libedataserver-%%VERSION%%.so.1
 lib/libedataserverui-%%VERSION%%.a
 lib/libedataserverui-%%VERSION%%.so
-lib/libedataserverui-%%VERSION%%.so.1
+lib/libedataserverui-%%VERSION%%.so.2
 lib/libegroupwise-%%VERSION%%.a
 lib/libegroupwise-%%VERSION%%.so
-lib/libegroupwise-%%VERSION%%.so.0
+lib/libegroupwise-%%VERSION%%.so.1
 libdata/bonobo/servers/GNOME_Evolution_DataServer_%%VERSION%%.server
+libdata/pkgconfig/camel-%%VERSION%%.pc
+libdata/pkgconfig/camel-provider-%%VERSION%%.pc
 libdata/pkgconfig/evolution-data-server-%%VERSION%%.pc
 libdata/pkgconfig/libebook-%%VERSION%%.pc
 libdata/pkgconfig/libecal-%%VERSION%%.pc
@@ -159,6 +299,8 @@ libdata/pkgconfig/libedata-cal-%%VERSION%%.pc
 libdata/pkgconfig/libedataserver-%%VERSION%%.pc
 libdata/pkgconfig/libedataserverui-%%VERSION%%.pc
 libdata/pkgconfig/libegroupwise-%%VERSION%%.pc
+libexec/camel-index-control-%%VERSION%%
+libexec/camel-lock-helper-%%VERSION%%
 libexec/evolution-data-server-%%VERSION%%
 share/doc/libebook/EBook.html
 share/doc/libebook/EBookListener.html
@@ -199,6 +341,7 @@ share/doc/libecal/right.png
 share/doc/libecal/style.css
 share/doc/libecal/up.png
 share/gnome/evolution-data-server-%%VERSION%%/evolutionperson.schema
+share/gnome/evolution-data-server-%%VERSION%%/glade/e-name-selector-dialog.glade
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Abidjan.ics
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Accra.ics
 share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa/Addis_Ababa.ics
@@ -650,10 +793,12 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/America
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo/Africa
 @dirrm share/gnome/evolution-data-server-%%VERSION%%/zoneinfo
+@dirrm share/gnome/evolution-data-server-%%VERSION%%/glade
 @dirrm share/gnome/evolution-data-server-%%VERSION%%
 @dirrm share/doc/libecal
 @dirrm share/doc/libebook
 @dirrm lib/evolution-data-server-%%VERSION%%/extensions
+@dirrm lib/evolution-data-server-%%VERSION%%/camel-providers
 @dirrm lib/evolution-data-server-%%VERSION%%
 @dirrm include/evolution-data-server-%%VERSION%%/libical
 @dirrm include/evolution-data-server-%%VERSION%%/libedataserverui
@@ -663,4 +808,5 @@ share/locale/zh_TW/LC_MESSAGES/evolution-data-server-%%EVO_VERSION%%.mo
 @dirrm include/evolution-data-server-%%VERSION%%/libecal
 @dirrm include/evolution-data-server-%%VERSION%%/libebook
 @dirrm include/evolution-data-server-%%VERSION%%/groupwise
+@dirrm include/evolution-data-server-%%VERSION%%/camel
 @dirrm include/evolution-data-server-%%VERSION%%