[claws-mail-plugins] 3.7.10-12 fix undefined symbol in vcalendar plugin snapshot (#768077)

[Michael Schwendt]

commit 58077ae4e2c34cff0c982f6c630cae699118ebc9
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date:   Thu Dec 15 19:54:13 2011 +0100

    3.7.10-12
    fix undefined symbol in vcalendar plugin snapshot (#768077)

 claws-mail-plugins.spec                     |   13 ++++++++++++-
 vcalendar-2.0.11cvs11-procmsg-no-lock.patch |   24 ++++++++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletions(-)
---
diff --git a/claws-mail-plugins.spec b/claws-mail-plugins.spec
index 949f9af..c11566d 100644
--- a/claws-mail-plugins.spec
+++ b/claws-mail-plugins.spec
@@ -25,7 +25,7 @@
 
 Name:           claws-mail-plugins
 Version:        3.7.10
-Release:        11%{?dist}
+Release:        12%{?dist}
 Summary:        Additional plugins for Claws Mail
 
 Group:          Applications/Internet
@@ -37,6 +37,10 @@ Source2:        fancy-0.9.14cvs1.tar.bz2
 Source3:        vcalendar-2.0.11cvs11.tar.gz
 
 Patch0:         claws-mail-extra-plugins-3.7.10-glib2-include.patch
+# procmsg_send_message_queue_with_lock() is post-3.7.10 Claws Mail API
+# this patch reverts the single call to the 3.7.10 API since nothing else
+# uses it yet either
+Patch1:         vcalendar-2.0.11cvs11-procmsg-no-lock.patch
 
 BuildRequires:  claws-mail-devel >= %{version}
 BuildRequires:  glib2-devel
@@ -361,6 +365,9 @@ mv fancy fancy-%{fancy}
 # extract cvs version of vcalendar plugin for crash-fix
 rm -r vcalendar-2.0.11
 tar -xvf %{SOURCE3}
+cd vcalendar-%{vcalendar}
+patch -p1 < %{PATCH1}
+cd -
 
 
 %build
@@ -803,6 +810,10 @@ find ${RPM_BUILD_ROOT} -type f -name "*.a" -exec rm -f {} ';'
 %{_includedir}/claws-mail/plugins/vcalendar/
 
 %changelog
+* Thu Dec 15 2011 Michael Schwendt <mschwendt at fedoraproject.org>
+- 3.7.10-12
+- fix undefined symbol in vcalendar plugin snapshot (#768077)
+
 * Mon Dec 12 2011 Michael Schwendt <mschwendt at fedoraproject.org>
 - 3.7.10-11
 - fix Fedora 15 specific typo in spec file, which made koji build stop early
diff --git a/vcalendar-2.0.11cvs11-procmsg-no-lock.patch b/vcalendar-2.0.11cvs11-procmsg-no-lock.patch
new file mode 100644
index 0000000..f9368da
--- /dev/null
+++ b/vcalendar-2.0.11cvs11-procmsg-no-lock.patch
@@ -0,0 +1,24 @@
+diff -Nur vcalendar-2.0.11cvs11-orig/src/claws.def vcalendar-2.0.11cvs11/src/claws.def
+--- vcalendar-2.0.11cvs11-orig/src/claws.def	2011-10-26 06:24:00.000000000 +0200
++++ vcalendar-2.0.11cvs11/src/claws.def	2011-12-15 19:28:15.928643059 +0100
+@@ -130,7 +130,7 @@
+ procmime_mimeinfo_get_parameter
+ procmsg_msginfo_free
+ procmsg_msginfo_get_full_info
+-procmsg_send_message_queue_with_lock
++procmsg_send_message_queue
+ qp_encode_line
+ remove_dir_recursive
+ slist_free_strings
+diff -Nur vcalendar-2.0.11cvs11-orig/src/vcal_manager.c vcalendar-2.0.11cvs11/src/vcal_manager.c
+--- vcalendar-2.0.11cvs11-orig/src/vcal_manager.c	2011-10-26 06:24:00.000000000 +0200
++++ vcalendar-2.0.11cvs11/src/vcal_manager.c	2011-12-15 19:28:27.528014065 +0100
+@@ -1427,7 +1427,7 @@
+ 	if (!prefs_common_get_prefs()->work_offline) {
+ 		gchar *err = NULL;
+ 		gboolean queued_removed = FALSE;
+-		gint val = procmsg_send_message_queue_with_lock(msgpath, &err, folderitem, msgnum, &queued_removed);
++		gint val = procmsg_send_message_queue(msgpath, &err, folderitem, msgnum, &queued_removed);
+ 		if (val == 0) {
+ 			if (!queued_removed)
+ 				folder_item_remove_msg(folderitem, msgnum);