[packages/qt5-qtcanvas3d] - rename qch bcond to doc (all docs require qtassistant now)

[baggins]

commit 567f7ba51c23859112f07b5cb7165f109be39e5a
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 23 11:27:52 2017 +0200

    - rename qch bcond to doc (all docs require qtassistant now)

 qt5-qtcanvas3d.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtcanvas3d.spec b/qt5-qtcanvas3d.spec
index 7811636..550c4a9 100644
--- a/qt5-qtcanvas3d.spec
+++ b/qt5-qtcanvas3d.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	qch	# documentation in QCH format
+%bcond_without	doc	# Documentation
 
 %define		orgname		qtcanvas3d
 %define		qtbase_ver		%{version}
@@ -23,7 +23,7 @@ BuildRequires:	Qt5OpenGLExtensions-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Qml-devel >= %{qtdeclarative_ver}
 BuildRequires:	Qt5Quick-devel >= %{qtdeclarative_ver}
 BuildRequires:	pkgconfig
-%if %{with qch}
+%if %{with doc}
 BuildRequires:	qt5-assistant >= %{qttools_ver}
 %endif
 BuildRequires:	qt5-build >= %{qtbase_ver}
@@ -119,15 +119,17 @@ Przykłady do modułu Qt5 Canvas 3D.
 %build
 qmake-qt5
 %{__make}
-%{__make} %{!?with_qch:html_}docs
+%{?with_doc:%{__make} docs}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 %{__make} install \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
 
-%{__make} install_%{!?with_qch:html_}docs \
+%if %{with doc}
+%{__make} install_docs \
 	INSTALL_ROOT=$RPM_BUILD_ROOT
+%endif
 
 # Prepare some files list
 ifecho() {
@@ -164,11 +166,11 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/qml/QtCanvas3D/plugins.qmltypes
 %{qt5dir}/qml/QtCanvas3D/qmldir
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtcanvas3d
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtcanvas3d.qch
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtcanvas3d.git/commitdiff/567f7ba51c23859112f07b5cb7165f109be39e5a