[emacs-vm/f17] Apply upstreams patch to fit changed signature of mail-user-agent (Bz 960295)

[Göran Uddeborg]

commit c308ab8e0a8981753fa4b1d23d396d1ad868557b
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Fri May 17 23:18:32 2013 +0200

    Apply upstreams patch to fit changed signature of mail-user-agent (Bz 960295)

 emacs-vm-8.1.2-useragent.patch |   31 +++++++++++++++++++++++++++++++
 emacs-vm.spec                  |    9 ++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/emacs-vm-8.1.2-useragent.patch b/emacs-vm-8.1.2-useragent.patch
new file mode 100644
index 0000000..b621b71
--- /dev/null
+++ b/emacs-vm-8.1.2-useragent.patch
@@ -0,0 +1,31 @@
+=== modified file 'lisp/vm.el'
+--- lisp/vm.el	2010-12-28 17:25:18 +0000
++++ lisp/vm.el	2011-01-23 11:05:17 +0000
+@@ -1059,12 +1059,14 @@
+ 		(list this-command)))
+   (vm-update-summary-and-mode-line))
+ 
++(defvar mail-reply-action)
+ (defvar mail-send-actions)
++(defvar mail-return-action)
+ 
+ ;;;###autoload
+ (defun vm-compose-mail (&optional to subject other-headers continue
+ 		        switch-function yank-action
+-			send-actions)
++			send-actions return-action &rest ignored)
+   (interactive)
+   (vm-session-initialization)
+   (if continue
+@@ -1106,7 +1108,9 @@
+ 		  (mail-yank-hooks (run-hooks 'mail-yank-hooks))
+ 		  (t (vm-mail-yank-default)))))
+       (make-local-variable 'mail-send-actions)
+-      (setq mail-send-actions send-actions))))
++      (setq mail-send-actions send-actions)
++      (make-local-variable 'mail-return-action)
++      (setq mail-return-action return-action))))
+ 
+ ;;;###autoload
+ (defun vm-submit-bug-report (&optional pre-hooks post-hooks)
+
diff --git a/emacs-vm.spec b/emacs-vm.spec
index 2173143..d98be42 100644
--- a/emacs-vm.spec
+++ b/emacs-vm.spec
@@ -17,11 +17,14 @@
 Summary: Emacs VM mailreader
 Name: emacs-vm
 Version: 8.1.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Group: Applications/Internet
 URL: https://launchpad.net/vm
 Source0: http://launchpad.net/vm/8.1.x/%{version}/+download/vm-%{version}.tgz
+# Use patch for emacs 24 from 8.2 branch.
+# https://bugs.launchpad.net/vm/+bug/705393
+Patch: %{name}-8.1.2-useragent.patch
 Requires: emacs >= %{_emacs_version}
 Requires(pre): /sbin/install-info 
 Requires(post): /sbin/install-info 
@@ -47,6 +50,7 @@ according to various criteria.
 
 %prep
 %setup -q -n vm-%{version}
+%patch -p0 -b .useragent
 
 # Add missing entry for u-vm-color.el to lisp Makefile.in
 sed -i -e '/SOURCES += tapestry.el/ a SOURCES += u-vm-color.el' lisp/Makefile.in
@@ -108,6 +112,9 @@ fi
 %{initfile}
 
 %changelog
+* Wed May 15 2013 Göran Uddeborg <goeran at uddeborg.se> - 8.1.2-2
+- Apply upstreams patch to fit changed signature of mail-user-agent (Bz 960295)
+
 * Wed May 30 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 8.1.2-1
 - Update to version 8.1.2
 - Remove separate emacs-vm-el sub-package to comply with updated