[mom] Install docs to %{_pkgdocdir} where available (#993977).

Ville Skyttä scop at fedoraproject.org
Wed Dec 11 17:23:48 UTC 2013


commit 9fe8b5d25454de21475a01246a96e7efe6bfe3cd
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Dec 11 19:23:48 2013 +0200

    Install docs to %{_pkgdocdir} where available (#993977).

 mom.spec |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)
---
diff --git a/mom.spec b/mom.spec
index 77827de..8768144 100644
--- a/mom.spec
+++ b/mom.spec
@@ -1,8 +1,9 @@
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 Name:           mom
 Version:        0.3.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        Dynamically manage system resources on virtualization hosts
 
 Group:          Applications/System
@@ -45,6 +46,7 @@ designed to accommodate new mechanisms such as cgroups.
 %prep
 %setup -q
 %patch0 -p1
+sed -i -e 's|/usr/share/doc/mom/|%{_pkgdocdir}/|' setup.py.in
 
 %build
 echo "v%{version}-%{release}" > VERSION
@@ -57,13 +59,9 @@ make
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
 install -Dp contrib/momd.init $RPM_BUILD_ROOT/%{_initrddir}/momd
-cp $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}/examples/mom-balloon+ksm.conf \
+cp -p $RPM_BUILD_ROOT/%{_pkgdocdir}/examples/mom-balloon+ksm.conf \
    $RPM_BUILD_ROOT/%{_sysconfdir}/momd.conf
-
-# Correct the installed location of documentation files
-mv $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name} \
-   $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}
-cp COPYING README $RPM_BUILD_ROOT/%{_defaultdocdir}/%{name}-%{version}
+cp -p COPYING README $RPM_BUILD_ROOT/%{_pkgdocdir}
 
 
 %clean
@@ -94,12 +92,16 @@ fi
 %{python_sitelib}/*
 %config(noreplace) %{_sysconfdir}/momd.conf
 
-# The use of '_defaultdocdir' conflicts with 'doc'. Therefore, 'doc' MUST NOT
+# The use of '_pkgdocdir' conflicts with '%%doc' in some distro versions.
+# Therefore, '%%doc' MUST NOT
 # be used to include additional documentation files so long as this is in use.
-%{_defaultdocdir}/%{name}-%{version}/
+%{_pkgdocdir}/
 
 
 %changelog
+* Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.3.2-7
+- Install docs to %%{_pkgdocdir} where available (#993977).
+
 * Thu Nov 21 2013 Adam Litke <alitke at redhat.com> 0.3.2-6
 - Bump version and rebuild
 


More information about the scm-commits mailing list