[emacs-bbdb] Allow either 2 and 3 semicolons in databases (BZ #1172912).

[Göran Uddeborg]

commit d043c773684dfd1fb72df9707183f11ce968a543
Author: Göran Uddeborg <goeran at uddeborg.se>
Date:   Sun Dec 14 23:39:12 2014 +0100

    Allow either 2 and 3 semicolons in databases (BZ #1172912).
    
    - Fix ":" (bbdb-mua-display-sender)  in mh-folder mode (BZ #1172915).
    - Update URL to the new Savannah site.
    - License is nowdays GPLv3+.
    - Include copying license file and a few missing documentation files.

 bbdb-3.1.2-mh-folder-mode-fix.patch |   16 ++++++++++++++++
 bbdb-3.1.2-migrate-fix.patch        |   14 ++++++++++++++
 emacs-bbdb.spec                     |   19 ++++++++++++++++---
 3 files changed, 46 insertions(+), 3 deletions(-)
---
diff --git a/bbdb-3.1.2-mh-folder-mode-fix.patch b/bbdb-3.1.2-mh-folder-mode-fix.patch
new file mode 100644
index 0000000..975be97
--- /dev/null
+++ b/bbdb-3.1.2-mh-folder-mode-fix.patch
@@ -0,0 +1,16 @@
+
+Add a missing mh-mode so that the ":" key bound to
+bbdb-mua-display-sender in mh-folder-mode works once again.
+
+--- bbdb-3.1.2/lisp/bbdb-mua.el-	2014-12-10 19:03:35.784311234 -0800
++++ bbdb-3.1.2/lisp/bbdb-mua.el	2014-12-10 19:03:46.553301211 -0800
+@@ -61,7 +61,7 @@
+   '((vm vm-mode vm-virtual-mode vm-summary-mode vm-presentation-mode)
+     (gnus gnus-summary-mode gnus-article-mode gnus-tree-mode)
+     (rmail rmail-mode rmail-summary-mode)
+-    (mh mhe-mode mhe-summary-mode mh-folder-mode)
++    (mh mhe-mode mhe-summary-mode mh-folder-mode mh-show-mode)
+     (message message-mode)
+     (mail mail-mode))
+   "Alist of MUA modes supported by BBDB.
+
diff --git a/bbdb-3.1.2-migrate-fix.patch b/bbdb-3.1.2-migrate-fix.patch
new file mode 100644
index 0000000..88a8526
--- /dev/null
+++ b/bbdb-3.1.2-migrate-fix.patch
@@ -0,0 +1,14 @@
+
+Allow format upgrade on version 6 databases where the format as
+two, not three semicolons in the comment.  (Like mine :-) 
+
+--- bbdb-3.1.2/lisp/bbdb.el-	2014-12-10 19:05:06.499218080 -0800
++++ bbdb-3.1.2/lisp/bbdb.el	2014-12-10 19:05:20.635201879 -0800
+@@ -3296,7 +3296,7 @@
+             (bbdb-overwrite-record-internal record))
+           ;; update file format
+           (goto-char (point-min))
+-          (if (re-search-forward (format "^;;; file-\\(version\\|format\\): %d$"
++          (if (re-search-forward (format "^;;;? file-\\(version\\|format\\): %d$"
+                                          file-format) nil t)
+               (replace-match (format ";;; file-format: %d" bbdb-file-format)))))))
diff --git a/emacs-bbdb.spec b/emacs-bbdb.spec
index 98071ee..ff799e5 100644
--- a/emacs-bbdb.spec
+++ b/emacs-bbdb.spec
@@ -11,16 +11,18 @@
 
 Name:           emacs-bbdb
 Version:        3.1.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        A contact management utility for use with Emacs
 Summary(sv):    Ett verktyg för att hantera kontakter i Emacs
 
-License:        GPLv2+
-URL:            http://bbdb.sourceforge.net/
+License:        GPLv3+
+URL:            http://savannah.nongnu.org/projects/bbdb/
 Requires:       emacs(bin) >= %{_emacs_version}
 
 Source0:        http://download.savannah.gnu.org/releases/bbdb/bbdb-%{version}.tar.gz
+Patch0:         bbdb-3.1.2-migrate-fix.patch
+Patch1:         bbdb-3.1.2-mh-folder-mode-fix.patch
 
 BuildArch:      noarch
 BuildRequires:  emacs info texinfo texinfo-tex
@@ -46,6 +48,8 @@ och VM).  BBDB går att anpassa fullständigt.
 
 %prep 
 %setup -q -n bbdb-%{version}
+%patch0 -p1
+%patch1 -p1
 
 %build
 %if %{vmsupport}
@@ -83,6 +87,8 @@ fi
 
 %files
 %doc %{_infodir}/bbdb.info.gz
+%doc AUTHORS NEWS README TODO
+%license COPYING
 %{_datadir}/bbdb
 %{lispdir}/
 %{_pkgdocdir}
@@ -90,6 +96,13 @@ fi
 
 
 %changelog
+* Sun Dec 14 2014 Göran Uddeborg <goeran at uddeborg.se> 1:3.1.2-2
+- Allow either 2 and 3 semicolons in databases (BZ #1172912).
+- Fix ":" (bbdb-mua-display-sender)  in mh-folder mode (BZ #1172915).
+- Update URL to the new Savannah site.
+- License is nowdays GPLv3+.
+- Include copying license file and a few missing documentation files.
+
 * Mon Jul  7 2014 Göran Uddeborg <goeran at uddeborg.se> 1:3.1.2-1
 - Upgrade to new version 3.1.2.