[redhat-rpm-config/f18] backport _pkgdocdir macro from F20

[Jens Petersen]

commit 38be71db20444d50ddf5a9a16eb9b9c60dbe511b
Author: Jens Petersen <petersen at redhat.com>
Date:   Mon Aug 26 14:04:14 2013 +0900

    backport _pkgdocdir macro from F20
    
    In F19 and earlier %_pkgdocdir is versioned of course unlike F20.
    Makes handling (un)versioned docdirs easier across releases (#986871).

 redhat-rpm-config-9.1.0-pkgdocdir.patch |   10 ++++++++++
 redhat-rpm-config.spec                  |    8 +++++++-
 2 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/redhat-rpm-config-9.1.0-pkgdocdir.patch b/redhat-rpm-config-9.1.0-pkgdocdir.patch
new file mode 100644
index 0000000..cdd0964
--- /dev/null
+++ b/redhat-rpm-config-9.1.0-pkgdocdir.patch
@@ -0,0 +1,10 @@
+--- redhat-rpm-config-9.1.0/macros~	2013-08-20 18:45:12.764205916 +0900
++++ redhat-rpm-config-9.1.0/macros	2013-08-20 18:46:45.657293197 +0900
+@@ -18,6 +18,7 @@
+ %_mandir		%{_prefix}/share/man
+ 
+ %_defaultdocdir		%{_prefix}/share/doc
++%_pkgdocdir             %{_docdir}/%{name}-%{version}
+ 
+ %_fmoddir		%{_libdir}/gfortran/modules
+ 
diff --git a/redhat-rpm-config.spec b/redhat-rpm-config.spec
index 7a40aee..0215a8e 100644
--- a/redhat-rpm-config.spec
+++ b/redhat-rpm-config.spec
@@ -1,7 +1,7 @@
 Summary: Red Hat specific rpm configuration files
 Name: redhat-rpm-config
 Version: 9.1.0
-Release: 37.1%{?dist}
+Release: 37.2%{?dist}
 # No version specified.
 License: GPL+
 Group: Development/System
@@ -45,6 +45,8 @@ Patch15: 0001-Drop-un-setting-LANG-and-DISPLAY-in-various-build-st.patch
 Patch16: redhat-rpm-config-9.1.0-filtering-spaces-in-filename.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=872737
 Patch17: redhat-rpm-config-9.1.0-java-repack-spaces-in-filenames.patch
+# backport _pkgdocdir macro from F20
+Patch23: redhat-rpm-config-9.1.0-pkgdocdir.patch
 BuildArch: noarch
 Requires: coreutils
 Requires: perl-srpm-macros
@@ -76,6 +78,7 @@ Red Hat specific rpm configuration files.
 %patch15 -p1
 %patch16 -p1
 %patch17 -p1
+%patch23 -p1
 
 %build
 
@@ -97,6 +100,9 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_sysconfdir}/rpm/*
 
 %changelog
+* Mon Aug 26 2013 Jens Petersen <petersen at redhat.com> - 9.1.0-37.2
+- backport new _pkgdocdir macro from F20
+
 * Wed May 29 2013 Adam Jackson <ajax at redhat.com> 9.1.0-37.1
 - redhat-config-*: Use + to append rather than %%rename, to protect against
   multiple -specs= ending up in the command line. (#892837)