backport _pkgdocdir macro from F20

In F19 %_pkgdocdir is versioned of course unlike F20.
Makes handling (un)versioned docdirs easier across releases (#986871).
This commit is contained in:
Jens Petersen 2013-08-20 18:57:10 +09:00
parent 3be8fc4ae6
commit 203d6084d5
2 changed files with 17 additions and 1 deletions

View File

@ -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

View File

@ -1,7 +1,7 @@
Summary: Red Hat specific rpm configuration files
Name: redhat-rpm-config
Version: 9.1.0
Release: 46%{?dist}
Release: 46.1%{?dist}
# No version specified.
License: GPL+
Group: Development/System
@ -56,6 +56,8 @@ Patch20: redhat-rpm-config-9.1.0-aarch64.patch
Patch21: redhat-rpm-config-9.1.0-fcflags.patch
# https://bugzilla.redhat.com/show_bug.cgi?id=669638
Patch22: redhat-rpm-config-9.1.0-ncpus-max.patch
# backport _pkgdocdir macro from F20
Patch23: redhat-rpm-config-9.1.0-pkgdocdir.patch
BuildArch: noarch
Requires: coreutils
Requires: perl-srpm-macros
@ -92,6 +94,7 @@ Red Hat specific rpm configuration files.
%patch20 -p1
%patch21 -p1
%patch22 -p1
%patch23 -p1
%build
@ -113,6 +116,9 @@ rm -rf ${RPM_BUILD_ROOT}
%{_sysconfdir}/rpm/*
%changelog
* Tue Aug 20 2013 Jens Petersen <petersen@redhat.com> - 9.1.0-46.1
- backport new _pkgdocdir macro from F20: in F19 it is versioned
* Thu Jun 27 2013 Panu Matilainen <pmatilai@redhat.com> - - 9.1.0-46
- make cpu limit for building configurable through _smp_ncpus_max macro