[emacs-bbdb] Run bbdb-canonicalize-net-hook manually rather than via run-hook-with-args in order to get the desir

[Göran Uddeborg]

commit 46dcae3b6a595d9cd76c8717b85c7dbd523ee616
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Thu Jul 5 16:37:41 2012 +0200

    Run bbdb-canonicalize-net-hook manually rather than via
    run-hook-with-args in order to get the desired return value.  Add a
    Swedish translation of the summary and description.

 bbdb-2.35-run-hook-with-args.patch |   18 ++++++++++++++++++
 emacs-bbdb.spec                    |   34 +++++++++++++++++++++++++++++++---
 2 files changed, 49 insertions(+), 3 deletions(-)
---
diff --git a/bbdb-2.35-run-hook-with-args.patch b/bbdb-2.35-run-hook-with-args.patch
new file mode 100644
index 0000000..8786886
--- /dev/null
+++ b/bbdb-2.35-run-hook-with-args.patch
@@ -0,0 +1,18 @@
+--- lisp/bbdb.el~	2007-01-02 09:01:18.000000000 +0100
++++ lisp/bbdb.el	2012-07-05 15:12:50.000000000 +0200
+@@ -3107,8 +3107,13 @@
+   ;; Now, do the hook run. Note, if you mess up, it's possible that
+   ;; BBDB will get stuck here oscillating between various definitions
+   ;; of the canonical address.
+-  (while (not (equal net (setq net (run-hook-with-args
+-                                    'bbdb-canonicalize-net-hook net)))))
++  (while (not (equal net
++		     (setq net
++			   (car (mapcar
++				 (lambda (hook)
++				   (funcall hook net))
++				 bbdb-canonicalize-net-hook
++				 ))))))
+ 
+   net)
+ 
diff --git a/emacs-bbdb.spec b/emacs-bbdb.spec
index 8b2dac7..14b3548 100644
--- a/emacs-bbdb.spec
+++ b/emacs-bbdb.spec
@@ -4,7 +4,7 @@
 # at build time. Hence there is a circular BuildRequires and bootstrapping is
 # required. The way to do this is (i) build emacs-vm without BuildRequires:
 # emacs-bbdb (ii) build emacs-bbdb with BuildRequires: emacs-vm (iii)
-# rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
+# rebuild emacs-vm with BuildRequires: emacs-bbdb.  Or vice versa.
 %define vmsupport 1
 
 %define lispdir %{_emacs_sitelispdir}/bbdb
@@ -13,9 +13,10 @@
 
 Name:           emacs-bbdb
 Version:        2.35
-Release:        8%{?dist}
+Release:        9%{?dist}
 Epoch:		1
 Summary:        A contact management utility for use with Emacs
+Summary(sv):    Ett verktyg för att hantera kontakter i Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
@@ -30,6 +31,11 @@ Patch0:		bbdb-2.35-fix_lisp_makefile.patch
 # Fix mh-cache-key to work with Emacs 24
 Patch1: 	bbdb-2.35-emacs24-fix-mh-cache-key.patch
 
+# Fix incorrect dependence on the return value from run-hook-with-args
+# Reported upstream:
+# http://www.mail-archive.com/bbdb-info%40lists.sourceforge.net/msg05749.html
+Patch2:		bbdb-2.35-run-hook-with-args.patch
+
 BuildArch:      noarch
 BuildRequires:  emacs texinfo-tex
 
@@ -58,6 +64,24 @@ the Gnus Summary Buffer, and Gnus scoring can be configured based on
 the contents of database records. Supercite citations can even be
 preset through the use of records in the BBDB.
 
+%description -l sv
+BBDB (The Insidious Big Brother Database) är ett verktyg för att
+hantera kontakter i Emacs skapat av Jamie Zawinski.  Det är nära
+integrerat med flera post- och nyhetsläsare, vilket gör att det kan
+skapa databasposter direkt från post- och nyhetsmeddelanden.  Som
+vanligt med program till Emacs kan detta skapande av poster
+konfigureras på olika sätt, från en boolesk inställning skapa/skapa
+inte till att en funktion som användaren anger styr om poster skall
+skapas.
+
+Databasposter kan användas för att lagra många olika sorters
+information, från namn och adress till URL:ar och X-Face-bilder.
+Denna information kan visas när ett meddelande tas emot från personen
+som är namngiven i databasposten.  Dessutom kan meddelanden från
+databasmedlemmar taggas i Gnus sammanfattningsbuffert, och Gnus
+poängsättning kan konfigureras baserat på innehållet i databasposten.
+Supercite-citat kan till och med fördefinieras med poster i BBDB.
+
 %prep 
 %setup -q -n bbdb-%{version}
 
@@ -69,6 +93,7 @@ done
 
 %patch0 -p 1 -b .fix_lisp_makefile
 %patch1 -p 0 -b .mh-cache-key
+%patch2 -p 0 -b .run-hook-with-args
 
 %build
 # Note --enable-developer simply gives more verbose output during building,
@@ -125,10 +150,13 @@ fi
 %changelog
 * Thu Jul  5 2012 Göran Uddeborg <goeran at uddeborg.se> 1:2.35-9
 - Remove obsolete "clean" and "defattr".
-- Update references to the removed -el packages in comments.
+- Update references to the removed -el packages in spec file comments.
 - Obsolete -el subpackages strictly less than release 7 rather than
   less than or equal to release 6.  Otherwise release 6 packages with
   a dist tag will be considered newer. (BZ #832822)
+- Run bbdb-canonicalize-net-hook manually rather than via
+  run-hook-with-args in order to get the desired return value.  (BZ #835318)
+- Swedish translation of the summary and description added.
 
 * Tue Jun  5 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-8
 - Change BuildRequires for emacs-vm-el to emacs-vm