[Falcon] Install docs to %{_pkgdocdir} where available (#993747).

Ville Skyttä scop at fedoraproject.org
Wed Dec 11 17:41:16 UTC 2013


commit d29e7efd8f1e8c0ed25bbddcaf0bb50293734ea5
Author: Ville Skyttä <ville.skytta at iki.fi>
Date:   Wed Dec 11 19:41:17 2013 +0200

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

 Falcon.spec |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)
---
diff --git a/Falcon.spec b/Falcon.spec
index 9254a8c..a5f1aa2 100644
--- a/Falcon.spec
+++ b/Falcon.spec
@@ -1,3 +1,4 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
 %global host     www.falconpl.org
 # latest bugfix release does not come with updated docs
 # remove once the releases are synced again
@@ -5,7 +6,7 @@
 
 Name:            Falcon
 Version:         0.9.6.8
-Release:         4%{?dist}
+Release:         5%{?dist}
 Summary:         The Falcon Programming Language
 Summary(it):     Il linguaggio di programmazione Falcon
 
@@ -81,13 +82,12 @@ This package contains HTML documentation for %{name}.
 %setup -q -a1
 %patch0 -p1 -b .mongo-cmake-linux-x64
 %patch1 -p1 -b .mongo-stdint
-mkdir largedocs
-mv %{docver}-html largedocs
 
 
 %build
+reldocdir=$(echo %{_pkgdocdir} | sed -e 's|^%{_prefix}/||')
 %cmake . \
-       -DFALCON_SHARE_DIR=share/doc/Falcon-%{version}
+       -DFALCON_SHARE_DIR=$reldocdir
 #-DFALCON_LIB_DIR=%{_lib} \
 #       -DFALCON_CMAKE_DIR=%{_lib}/falcon/cmake \
 
@@ -97,6 +97,7 @@ make VERBOSE=1 %{?_smp_flags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR %{docver}-html $RPM_BUILD_ROOT%{_pkgdocdir}
 
 
 %clean
@@ -109,7 +110,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc %{_datadir}/doc/Falcon-%{version}
+%doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/%{docver}-html
 %exclude %{_bindir}/falcon-conf
 %exclude %{_bindir}/falconeer.fal
 %exclude %{_bindir}/faltest
@@ -135,10 +137,13 @@ rm -rf $RPM_BUILD_ROOT
 
 %files doc
 %defattr(-,root,root,-)
-%doc largedocs/*
+%doc %{_pkgdocdir}/%{docver}-html
 
 
 %changelog
+* Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.9.6.8-5
+- Install docs to %%{_pkgdocdir} where available (#993747).
+
 * Fri Aug 02 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.6.8-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 


More information about the scm-commits mailing list