rpms/emacs-bbdb/F-8 bbdb-2.36-revert106.patch, NONE, 1.1 emacs-bbdb.spec, 1.2, 1.3 sources, 1.3, 1.4

[Jonathan G. Underwood]

Author: jgu

Update of /cvs/extras/rpms/emacs-bbdb/F-8
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19769

Modified Files:
	emacs-bbdb.spec sources 
Added Files:
	bbdb-2.36-revert106.patch 
Log Message:
* Thu Nov  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.36-0.1.20080928cvs
- Rename snapshot to reflect the fact that it is a 2.36 pre-release rather than
  a post 2.35 snapshot
- Fix day of previous spec file changelog entry
- Added a patch to revert upstream SVN revision 106 (which is suitable for
  emacs>=23) (BZ 467909)


bbdb-2.36-revert106.patch:

--- NEW FILE bbdb-2.36-revert106.patch ---
diff -up bbdb-2.36/lisp/bbdb-vm.el.revert106 bbdb-2.36/lisp/bbdb-vm.el
--- bbdb-2.36/lisp/bbdb-vm.el.revert106	2008-10-29 01:13:03.000000000 +0000
+++ bbdb-2.36/lisp/bbdb-vm.el	2008-10-29 01:13:27.000000000 +0000
@@ -93,7 +93,7 @@ C-g again it will stop scanning."
     (if (not bbdb/vm-offer-to-create)
         (setq cache (and msg (bbdb-message-cache-lookup msg))))
 
-    (if cache
+    (if nil;cache
         (setq records (if bbdb-get-only-first-address-p
                           (list (car cache))
                         cache))


Index: emacs-bbdb.spec
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-8/emacs-bbdb.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- emacs-bbdb.spec	28 Sep 2008 23:23:28 -0000	1.2
+++ emacs-bbdb.spec	7 Nov 2008 00:07:31 -0000	1.3
@@ -15,7 +15,6 @@
 # 1. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb login
 # 2. cvs -d :pserver:anonymous at bbdb.cvs.sourceforge.net:/cvsroot/bbdb checkout bbdb
 # 3. cd bbdb ; autonconf ; ./configure ; make tar
-# 4. mv bbdb-2.36 bbdb-2.35.YYYYMMDDcvs.tar.gz
 %define cvs_ver 20080928cvs
  
 # Note on building bbdb with support for VM: if support for VM in bbdb is
@@ -32,15 +31,19 @@
 	
 
 Name:           emacs-bbdb
-Version:        2.35
-Release:        9.%{cvs_ver}%{?dist}
+Version:        2.36
+Release:        0.1.%{cvs_ver}%{?dist}
 Summary:        A contact management utility for use with Emacs
 Group:          Applications/Internet
 License:        GPLv2+
 URL:            http://bbdb.sourceforge.net/
 Requires:       emacs(bin) >= %{emacs_version}
 
-Source0:        bbdb-2.35.%{cvs_ver}.tar.gz
+Source0:        bbdb-2.36.%{cvs_ver}.tar.gz
+# This patch reverts commit 106 - commit 106 only works with VM >= 8.1.0
+# http://bbdb.cvs.sourceforge.net/viewvc/bbdb/bbdb/lisp/bbdb-vm.el?r1=1.105&r2=1.106
+Patch0:		bbdb-2.36-revert106.patch
+
 BuildArch:      noarch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  emacs emacs-el texinfo-tex
@@ -83,6 +86,8 @@
     mv $i.new $i
 done
 
+%patch0 -p1 -b .revert106
+
 %build
 # Note --enable-developer simply gives more verbose output during building,
 # handy for debugging
@@ -146,7 +151,14 @@
 %{lispdir}/*.el
 
 %changelog
-* Sat Sep 28 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
+* Thu Nov  6 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.36-0.1.20080928cvs
+- Rename snapshot to reflect the fact that it is a 2.36 pre-release rather than
+  a post 2.35 snapshot
+- Fix day of previous spec file changelog entry
+- Added a patch to revert upstream SVN revision 106 (which is suitable for
+  emacs>=23) (BZ 467909)
+
+* Sat Sep 29 2008 Jonathan G. Underwood <jonathan.underwood at gmail.com> - 2.35-9.20080928cvs
 - Update to current CVS snapshot, fixing several bugs
 - Ensure that bbdb-vm.elc is built and installed (BZ 462875)
 - Add --enable-developer to configure for more verbose build info


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/emacs-bbdb/F-8/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources	28 Sep 2008 23:23:28 -0000	1.3
+++ sources	7 Nov 2008 00:07:31 -0000	1.4
@@ -1 +1 @@
-3edf3378898af66f7505f64f2ec2eddc  bbdb-2.35.20080928cvs.tar.gz
+3edf3378898af66f7505f64f2ec2eddc  bbdb-2.36.20080928cvs.tar.gz