[notmuch/f16: 8/8] merge

[Karel Klíč]

commit 438911c4557571d1f8a95541b93dfcb905c4c309
Merge: a55d9ee b465405
Author: Karel Klic <kklic at redhat.com>
Date:   Fri Jul 13 12:28:46 2012 +0200

    merge

 .gitignore                |    4 +
 notmuch-0.6.1-gmime.patch |  233 ---------------------------------------------
 notmuch.spec              |  107 +++++++++++++++++----
 sources                   |    2 +-
 4 files changed, 92 insertions(+), 254 deletions(-)
---
diff --cc notmuch.spec
index 421118c,3d57df7..f7f5754
--- a/notmuch.spec
+++ b/notmuch.spec
@@@ -98,13 -136,39 +136,42 @@@ install contrib/notmuch-mutt/notmuch-mu
  %{_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}/*
+ 
+ %files mutt
+ %{_bindir}/notmuch-mutt
+ %{_mandir}/man1/notmuch-mutt.1*
  
  %changelog
+ * Fri Jul 13 2012 Karel Klíč <kklic at redhat.com> - 0.13.2-2
+ - Packaged notmuch-mutt from contrib
+ 
+ * 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
+ 
+ * Mon Jan 30 2012 Stanislav Ochotnicky <sochotnicky at redhat.com> - 0.11-1
+ - Latest upstream release
+ - Update patch so it applies
+ 
+ * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+ 
+ * Thu Oct 20 2011 Luke Macken <lmacken at redhat.com> - 0.9-1
+ - Latest upstream release
+ 
 +* Wed Mar  7 2012 Karel Klíč <kklic at redhat.com> - 0.6.1-2
 +- Added patch for CVE-2011-1103: tag information disclosure flaw
 +
+ * Tue Aug 09 2011 Luke Macken <lmacken at redhat.com> - 0.6.1-2
+ - Create a subpackage for the Python bindings
+ 
  * Thu Jul 28 2011 Karel Klíč <kklic at redhat.com> - 0.6.1-1
  - Latest upstream release
  - Added -gmime patch to compile with GMime 2.5.x (upstream uses GMime 2.4.x)