[fawkes] Install docs to %{_pkgdocdir} where available (#993748).
Ville Skyttä
scop at fedoraproject.org
Wed Dec 11 18:13:44 UTC 2013
commit a4ac256103408955280e78a44b7084e7c2c17d07
Author: Ville Skyttä <ville.skytta at iki.fi>
Date: Wed Dec 11 20:13:41 2013 +0200
Install docs to %{_pkgdocdir} where available (#993748).
- Disable parallel build.
fawkes.spec | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
---
diff --git a/fawkes.spec b/fawkes.spec
index dec8cf4..0018c6d 100644
--- a/fawkes.spec
+++ b/fawkes.spec
@@ -1,6 +1,8 @@
+%{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}}
+
Name: fawkes
Version: 0.5.0
-Release: 13%{?dist}
+Release: 14%{?dist}
Summary: Robot Software Framework
Group: Applications/System
@@ -470,8 +472,9 @@ functionality.
%else
%define feature_flags HAVE_ROS=0 HAVE_OPENRAVE=0 HAVE_OPENNI=0
%endif
+# No _smp_mflags; build is not parallel clean
make uncolored-switch-buildtype-sysinstall
-make uncolored-all uncolored-gui %{?_smp_mflags} CFLAGS_EXT="%{optflags}" PREFIX=%{_prefix} \
+make uncolored-all uncolored-gui CFLAGS_EXT="%{optflags}" PREFIX=%{_prefix} \
%{feature_flags}
# Ignore documentation errors until fresh doxygen release hits build machines.
# Doxygen 1.7.1 is totally buggy and reports hundreds of false positives.
@@ -479,7 +482,8 @@ make uncolored-apidoc || true
%install
rm -rf %{buildroot}
-make install DESTDIR=%{buildroot} PREFIX=%{_prefix} %{feature_flags}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} EXEC_DOCDIR=%{_pkgdocdir} %{feature_flags}
+install -pm 644 README doc/DEPENDENCIES doc/LICENSE.* %{buildroot}%{_pkgdocdir}
# We do not package OpenRAVE, yet.
rm %{buildroot}%{_libdir}/fawkes/interfaces/libOpenRaveInterface*
@@ -489,12 +493,6 @@ rm %{buildroot}%{_libdir}/libfawkesopenraveaspect.so*
# Use xargs instead of exec to abort the build on desktop-file-validate fail
find %{buildroot}%{_datadir}/applications -name '*.desktop' | xargs -L 1 desktop-file-validate
-# For building packages prior to release
-#mv {buildroot}/{_datadir}/doc/{name}-{version} {buildroot}/{_datadir}/doc/{name}-{version}
-
-# We do not want that perl script installed
-rm -f %{buildroot}/%{_datadir}/doc/%{name}-%{version}/installdox
-
ls src/libs/interfaces/*.xml | sed -e "s|^src/libs/interfaces/\([^.]\+\)\.xml|%{_libdir}/%{name}/interfaces/lib\1.so*|" > builtin-interfaces.files
ls src/libs/interfaces/*.xml | sed -e "s|^src/libs/interfaces/\([^.]\+\)\.xml|%{_libdir}/%{name}/lua/interfaces/\1.so|" > builtin-interfaces-lua.files
@@ -520,7 +518,9 @@ rm -rf %{buildroot}
%files core -f builtin-interfaces.files
%defattr(-,root,root,-)
-%doc README doc/LICENSE.*
+%dir %{_pkgdocdir}
+%{_pkgdocdir}/README
+%{_pkgdocdir}/LICENSE.*
%dir %{_sysconfdir}/%{name}
%dir %{_datadir}/%{name}
%config(noreplace) %{_sysconfdir}/%{name}/default.sql
@@ -827,7 +827,7 @@ rm -rf %{buildroot}
%files devel
%defattr(-,root,root,-)
-%doc doc/DEPENDENCIES
+%{_pkgdocdir}/DEPENDENCIES
%{_bindir}/ffifacegen
%{_includedir}/*
%{_libdir}/*.so
@@ -845,9 +845,16 @@ rm -rf %{buildroot}
%files doc
%defattr(-,root,root,-)
-%{_datadir}/doc/%{name}-%{version}
+%{_pkgdocdir}/*
+%exclude %{_pkgdocdir}/DEPENDENCIES
+%exclude %{_pkgdocdir}/README
+%exclude %{_pkgdocdir}/LICENSE.*
%changelog
+* Wed Dec 11 2013 Ville Skyttä <ville.skytta at iki.fi> - 0.5.0-14
+- Install docs to %%{_pkgdocdir} where available (#993748).
+- Disable parallel build.
+
* Wed Oct 09 2013 Rich Mattes <richmattes at gmail.com> - 0.5.0-13
- Rebuild for new geos
More information about the scm-commits
mailing list