[notmuch] New upstream release

[Karel Klíč]

commit 249d02afc14a48a8e8960f2776a5125e0b15f3dd
Author: Karel Klic <kklic at redhat.com>
Date:   Fri Jul 13 12:02:16 2012 +0200

    New upstream release

 .gitignore                |    1 +
 notmuch-0.6.1-gmime.patch |  255 ---------------------------------------------
 notmuch.spec              |   32 +++---
 sources                   |    2 +-
 4 files changed, 16 insertions(+), 274 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7b6707c..ffea596 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /notmuch-0.9.tar.gz
 /notmuch-0.11.tar.gz
 /notmuch-0.11.1.tar.gz
+/notmuch-0.13.2.tar.gz
diff --git a/notmuch.spec b/notmuch.spec
index 1747bc3..3fa50d7 100644
--- a/notmuch.spec
+++ b/notmuch.spec
@@ -1,14 +1,13 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 Name: notmuch
-Version: 0.11.1
+Version: 0.13.2
 Release: 1%{?dist}
 Summary: System for indexing, searching, and tagging email
 Group: Applications/Internet
 License: GPLv3+
 URL: http://notmuchmail.org/
 Source0: http://notmuchmail.org/releases/notmuch-%{version}.tar.gz
-Patch0: notmuch-0.6.1-gmime.patch
 BuildRequires: xapian-core-devel
 BuildRequires: gmime-devel
 BuildRequires: libtalloc-devel
@@ -47,19 +46,12 @@ Summary: Not much support for Emacs
 Group: Applications/Editors
 BuildArch: noarch
 Requires: %{name} = %{version}-%{release}, emacs(bin) >= %{_emacs_version}
+Obsoletes: emacs-notmuch-el < 0.11.1-2
+Provides: emacs-notmuch-el < 0.11.1-2
 
 %description -n emacs-notmuch
 %{summary}.
 
-%package -n emacs-notmuch-el
-Summary: Elisp source files for Not much support for Emacs
-Group: Applications/Editors
-BuildArch: noarch
-Requires: emacs-notmuch = %{version}-%{release}
-
-%description -n emacs-notmuch-el
-%{summary}.
-
 %package -n python-notmuch
 Summary: Python bindings for notmuch
 Group: Development/Libraries
@@ -72,7 +64,6 @@ BuildRequires: python-devel
 
 %prep
 %setup -q
-%patch0 -p1 -b .gmime
 
 %build
 # The %%configure macro cannot be used because notmuch doesn't support
@@ -103,29 +94,34 @@ popd
 %postun -p /sbin/ldconfig
 
 %files
-%doc AUTHORS COPYING COPYING-GPL-3 INSTALL README TODO
+%doc AUTHORS COPYING COPYING-GPL-3 INSTALL README
 %{_sysconfdir}/bash_completion.d/notmuch
 %{_datadir}/zsh/functions/Completion/Unix/_notmuch
 %{_bindir}/notmuch
-%{_mandir}/man1/notmuch.1*
-%{_libdir}/libnotmuch.so.2*
+%{_mandir}/man1/notmuch*.1*
+%{_mandir}/man5/notmuch*.5*
+%{_mandir}/man7/notmuch*.7*
+%{_libdir}/libnotmuch.so.3*
 
 %files devel
 %{_libdir}/libnotmuch.so
 %{_includedir}/*
 
 %files -n emacs-notmuch
+%{_emacs_sitelispdir}/*.el
 %{_emacs_sitelispdir}/*.elc
 %{_emacs_sitelispdir}/notmuch-logo.png
 
-%files -n emacs-notmuch-el
-%{_emacs_sitelispdir}/*.el
-
 %files -n python-notmuch
 %doc bindings/python/README
 %{python_sitelib}/*
 
 %changelog
+* Fri Jul 13 2012 Karel Klíč <kklic at redhat.com> - 0.13.2-1
+- Update to the newest release
+- Merge emacs-notmuch-el into emacs-el to conform to the packaging
+  guidelines
+
 * Wed Mar  7 2012 Karel Klíč <kklic at redhat.com> - 0.11.1-1
 - Update to newest release, which fixes CVE-2011-1103
 
diff --git a/sources b/sources
index 7fd3d24..b9f75ac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e78e0a2a99177f5b0edf472baa6f1128  notmuch-0.11.1.tar.gz
+13be4cf1ab2be49b42fec87c3cb44a5a  notmuch-0.13.2.tar.gz