[emacs-bbdb/f17] - Update references to the removed -el packages in spec file comments. - Obsolete -el subpackages st

[Göran Uddeborg]

commit 338d03953cce5a072505e9f39fe9559b7260dcf0
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Thu Jul 5 17:31:34 2012 +0200

    - 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.
    - Run bbdb-canonicalize-net-hook manually rather than via
      run-hook-with-args in order to get the desired return value.

 emacs-bbdb.spec |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)
---
diff --git a/emacs-bbdb.spec b/emacs-bbdb.spec
index 1788696..0c34d9a 100644
--- a/emacs-bbdb.spec
+++ b/emacs-bbdb.spec
@@ -3,8 +3,8 @@
 # support for BBDB is required in VM, then the BBDB source elisp must be present
 # 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-el (ii) build emacs-bbdb with BuildRequires: emacs-vm-el (iii)
-# rebuild emacs-vm with BuildRequires: emacs-bbdb-el. Or vice versa.
+# emacs-bbdb (ii) build emacs-bbdb with BuildRequires: emacs-vm (iii)
+# rebuild emacs-vm with BuildRequires: emacs-bbdb.  Or vice versa.
 %define vmsupport 1
 
 %define lispdir %{_emacs_sitelispdir}/bbdb
@@ -13,7 +13,7 @@
 
 Name:           emacs-bbdb
 Version:        2.35
-Release:        7%{?dist}
+Release:        8%{?dist}
 Epoch:		1
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
@@ -30,6 +30,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
 
@@ -38,7 +43,7 @@ BuildRequires:  emacs-vm-el
 %endif
 
 # This obsolete and provides can be removed in Fedora 20
-Obsoletes:	%{name}-el <= 1:2.35-6
+Obsoletes:	%{name}-el < 1:2.35-7
 Provides:	%{name}-el <= 1:2.35-6
 
 %description 
@@ -69,6 +74,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,
@@ -127,6 +133,14 @@ fi
 
 
 %changelog
+* Thu Jul  5 2012 Göran Uddeborg <goeran at uddeborg.se> 1:2.35-9
+- 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)
+
 * Tue Jun  5 2012 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 1:2.35-7
 - Remove separate emacs-bbdb-el sub-package
 - Add patch to work with Emacs 24 (BZ #828582)