[nmh] Remove version from the docdir

Josh Bressers bressers at fedoraproject.org
Fri Aug 9 20:30:53 UTC 2013


commit f992cb9a4cf8514c825c55ff5e979b05b1a0639f
Author: bress <josh at bress.net>
Date:   Fri Aug 9 15:30:18 2013 -0500

    Remove version from the docdir

 nmh.spec |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/nmh.spec b/nmh.spec
index 70aaa64..d634298 100644
--- a/nmh.spec
+++ b/nmh.spec
@@ -1,6 +1,6 @@
 Name:           nmh
 Version:        1.5
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        A capable mail handling system with a command line interface.
 
 Group:          Applications/Internet
@@ -36,7 +36,7 @@ CFLAGS="$RPM_OPT_FLAGS -fno-builtin-strcasecmp"
 %configure \
             --sysconfdir=%{_sysconfdir}/nmh \
             --libdir=%{_libexecdir}/nmh \
-            --docdir=%{_datadir}/doc/nmh-%{version} \
+            --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} \
             --with-locking=fcntl
 make
 
@@ -54,9 +54,12 @@ chmod g-s $RPM_BUILD_ROOT/%{_bindir}/inc
 %dir %{_libexecdir}/nmh
 %{_libexecdir}/nmh/*
 %{_mandir}/man[851]/*
-%doc %{_datadir}/doc/nmh-%{version}
+%doc %{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}}
 
 %changelog
+* Fri Aug 09 2013 Josh Bressers <bressers at redhat.com> 0:1.5-8
+- Switch to unversioned docdir
+
 * Fri Aug 09 2013 Josh Bressers <bressers at redhat.com> 0:1.5-7
 - Re-run autoconf to pick 2.69 changes
 - Properly package the doc directory


More information about the scm-commits mailing list