[evolution-rspam] update to 0.1.1 upstream release add patch to build against evolution-data-server 2.91.0

[Milan Crha]

commit e0c7b3a769ac9b948bfcd478b4dd0516ca09fcc0
Author: Milan Crha <mcrha at redhat.com>
Date:   Mon Oct 11 15:30:30 2010 +0200

    update to 0.1.1 upstream release
    add patch to build against evolution-data-server 2.91.0

 evolution-rspam.spec        |    9 ++++-
 rspam-0.1.1-eds2.91.0.patch |   78 +++++++++++++++++++++++++++++++++++++++++++
 sources                     |    2 +-
 3 files changed, 87 insertions(+), 2 deletions(-)
---
diff --git a/evolution-rspam.spec b/evolution-rspam.spec
index 20db9f6..fd6e36a 100644
--- a/evolution-rspam.spec
+++ b/evolution-rspam.spec
@@ -1,6 +1,6 @@
 Name: evolution-rspam
 Summary: Evolution Plugin for reporting spam
-Version: 0.1.0
+Version: 0.1.1
 Release: 1%{?dist}
 Group: Applications/Internet
 License: GPLv2+
@@ -19,6 +19,8 @@ Requires(preun): GConf2
 BuildRequires: gettext, evolution-devel, perl(XML::Parser), intltool
 BuildRequires: gnome-common, libtool
 
+Patch1: rspam-0.1.1-eds2.91.0.patch
+
 %description
 Rspam Evolution Plugin enables Evolution Mail client to report email messages
 as spam to checksum-based and statistical filtering networks.
@@ -28,6 +30,7 @@ See README for more information about required programs.
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch1 -p1 -b .eds2.91.0
 
 %build
 %configure
@@ -75,6 +78,10 @@ fi
 %doc TODO
 
 %changelog
+* Mon Oct 11 2010 Milan Crha <mcrha at redhat.com> - 0.1.1-1
+- update to 0.1.1 upstream release
+- add patch to build against evolution-data-server 2.91.0
+
 * Fri Jul 09 2010 Lucian Langa <cooly at gnome.eu.org> - 0.1.0-1
 - new upstream release
 
diff --git a/rspam-0.1.1-eds2.91.0.patch b/rspam-0.1.1-eds2.91.0.patch
new file mode 100644
index 0000000..99972fd
--- /dev/null
+++ b/rspam-0.1.1-eds2.91.0.patch
@@ -0,0 +1,78 @@
+diff -r -up evolution-rspam.old/src/rspam.c evolution-rspam/src/rspam.c
+--- evolution-rspam.old/src/rspam.c	2010-08-02 21:51:43.000000000 +0200
++++ evolution-rspam/src/rspam.c	2010-10-11 15:16:33.000000000 +0200
+@@ -26,6 +26,7 @@
+ #include <string.h>
+ #include <stdio.h>
+ #include <fcntl.h>
++#include <sys/time.h>
+ 
+ #include <gtk/gtk.h>
+ 
+@@ -52,14 +53,18 @@
+ #include <shell/es-event.h>
+ #endif
+ 
++#include <e-util/e-account-utils.h>
++#include <e-util/e-alert-dialog.h>
+ #include <e-util/e-mktemp.h>
+ #include <mail/em-config.h>
+ #include <mail/mail-config.h>
++#include <mail/mail-tools.h>
+ 
+ #include <gtkhtml/gtkhtml.h>
+ 
+ 
+ #include <libedataserver/e-account-list.h>
++#include <libedataserver/e-data-server-util.h>
+ 
+ #include <mail/em-utils.h>
+ #include <mail/mail-ops.h>
+@@ -145,8 +150,8 @@ save_message(CamelMimeMessage *msg)
+ 		goto fail;
+ 
+ 	// dump the whole message incl headers to report
+-	if (camel_data_wrapper_decode_to_stream((CamelDataWrapper *)msg, out, NULL) == -1
+-	|| camel_stream_close(out, NULL) == -1) {
++	if (camel_data_wrapper_decode_to_stream_sync((CamelDataWrapper *)msg, out, NULL, NULL) == -1
++	|| camel_stream_close(out, NULL, NULL) == -1) {
+ #if (DATASERVER_VERSION >= 2031001)
+ 		g_object_unref(out);
+ #else
+@@ -350,12 +355,12 @@ spamcop_report(CamelMimeMessage *msg, gc
+ 				NULL);
+ 		g_free(tmsg);
+ 		mem = camel_stream_mem_new();
+-		camel_stream_write(mem, tmp, strlen(tmp), NULL);
++		camel_stream_write(mem, tmp, strlen(tmp), NULL, NULL);
+ 		camel_stream_reset(mem, NULL);
+ 		g_free(tmp);
+ 		msg = camel_mime_message_new();
+-		camel_data_wrapper_construct_from_stream(
+-			CAMEL_DATA_WRAPPER(msg), mem, NULL);
++		camel_data_wrapper_construct_from_stream_sync(
++			CAMEL_DATA_WRAPPER(msg), mem, NULL, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 		g_object_unref(mem);
+ #else
+@@ -650,8 +655,8 @@ org_gnome_sa_revoke (GtkAction *action,
+ 		gtk_main_iteration ();
+ 
+ 	for (i = 0; i < (uids ? uids->len : 0); i++) {
+-		msg = camel_folder_get_message(
+-			folder, g_ptr_array_index(uids, i), NULL);
++		msg = camel_folder_get_message_sync(
++			folder, g_ptr_array_index(uids, i), NULL, NULL);
+ 		if (!msg)
+ 			continue;
+ 
+@@ -735,7 +740,7 @@ pyzor_discover_cb (GtkWidget *widget, gp
+ 		camel_stream_mem_set_byte_array (memstream, output_buffer);
+ 
+ 		camel_stream_write_to_stream (
+-			stream, (CamelStream *) memstream, NULL);
++			stream, (CamelStream *) memstream, NULL, NULL);
+ #if (DATASERVER_VERSION >= 2031001)
+ 		g_object_unref (stream);
+ #else
+
diff --git a/sources b/sources
index 1c19cac..cc9602b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-766018b4cfc108de58cf68aee37aea51  evolution-rspam-0.1.0.tar.gz
+c036967bec706774cb4142aa6c21fbce  evolution-rspam-0.1.1.tar.gz