[sparsehash] Install docs to %{_pkgdocdir} where available (#994101).

Ville Skyttä scop at fedoraproject.org
Mon Dec 16 18:49:51 UTC 2013


commit 4e040669ab5fb517c1cf3e29572aeaddbf0a7c35
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Mon Dec 16 20:49:57 2013 +0200

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

 sparsehash.spec |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)
---
diff --git a/sparsehash.spec b/sparsehash.spec
index ccb36ea..2012f9b 100644
--- a/sparsehash.spec
+++ b/sparsehash.spec
@@ -1,9 +1,10 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 # disable -debuginfo subpackage
 %global debug_package %{nil}
 
 Name:           sparsehash
 Version:        1.12
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Extremely memory-efficient C++ hash_map implementation
 
 Group:          Development/Libraries
@@ -36,21 +37,24 @@ speed.
 make %{?_smp_mflags}
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=$RPM_BUILD_ROOT docdir=%{_pkgdocdir}
 
 # Remove unneeded files
-rm $RPM_BUILD_ROOT%{_defaultdocdir}/sparsehash-%{version}/INSTALL
-rm $RPM_BUILD_ROOT%{_defaultdocdir}/sparsehash-%{version}/README_windows.txt
+rm $RPM_BUILD_ROOT%{_pkgdocdir}/INSTALL
+rm $RPM_BUILD_ROOT%{_pkgdocdir}/README_windows.txt
 
 %check
 make check
 
 %files devel
-%doc %{_defaultdocdir}/sparsehash-%{version}/
+%doc %{_pkgdocdir}/
 %{_includedir}/google/
 %{_libdir}/pkgconfig/libsparsehash.pc
 
 %changelog
+* Mon Dec 16 2013 Ville Skyttä <ville.skytta at iki.fi> - 1.12-5
+- Install docs to %%{_pkgdocdir} where available (#994101).
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.12-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list