[nmh/f17] Update nmh to version 1.5

[Josh Bressers]

commit 306224184a36b7c77f1982ef8cf4f5d6ca34100d
Author: Josh Bressers <josh at bress.net>
Date:   Mon Jul 2 07:46:52 2012 -0500

    Update nmh to version 1.5

 .gitignore                |    1 +
 nmh-1.1-inc_install.patch |   11 -----------
 nmh.spec                  |   14 ++++++++------
 sources                   |    2 +-
 4 files changed, 10 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6705324..2ec72bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 nmh-1.3.tar.gz
+/nmh-1.5.tar.gz
diff --git a/nmh.spec b/nmh.spec
index 2ccfa55..ffaf5c6 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -1,13 +1,12 @@
 Name:           nmh
-Version:        1.4
+Version:        1.5
 Release:        1%{?dist}
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
 License:        BSD
 URL:            http://savannah.nongnu.org/projects/nmh
-Source0:        nmh-1.4.tar.gz
-Patch0:         nmh-1.1-inc_install.patch
+Source0:        nmh-1.5.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  ncurses-devel
 BuildRequires:  db4-devel
@@ -26,14 +25,14 @@ email user agent, you'll want to also install exmh to provide a user
 interface for it--nmh only has a command line interface.
 
 %prep
-%setup -q -n nmh-1.4
-%patch0 -p0
+%setup -q -n nmh-1.5
 
 %build
 CFLAGS="$RPM_OPT_FLAGS -fno-builtin-strcasecmp"
 %configure \
             --sysconfdir=%{_sysconfdir}/nmh \
             --libdir=%{_libexecdir}/nmh \
+            --docdir=%{_datadir}/doc/nmh-%{version} \
             --with-locking=fcntl \
             --enable-pop
 make
@@ -59,9 +58,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_libexecdir}/nmh/*
 %{_mandir}/man[851]/*
 %doc docs/COMPLETION-* docs/DIFFERENCES docs/FAQ docs/MAIL.FILTERING VERSION
-%doc docs/TODO docs/README* COPYRIGHT
+%doc docs/TODO docs/README* COPYRIGHT docs/contrib/
 
 %changelog
+* Thu Jun 22 2012 David Levine <levinedl at acm.org> 0:1.5-1
+- Update nmh to 1.5
+
 * Sun Jan 15 2012 Josh Bressers <bressers at redhat.com> 0:1.4-1
 - Update nmh to 1.4
 
diff --git a/sources b/sources
index 00e07cc..222da1b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ef55286a821c53dc52b8974977c011ca  nmh-1.4.tar.gz
+5a7bc5a157f4428f7660bb882e842375  nmh-1.5.tar.gz