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

diff --git a/qt5-qt3d.spec b/qt5-qt3d.spec
index 4df5a0b994af39991247cee3d0721960f4e3c75c..382d417d9d44cb4aa894c85478ad7ee0422fa833 100644 (file)
--- a/qt5-qt3d.spec
+++ b/qt5-qt3d.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without qch     # documentation in QCH format
+%bcond_without doc     # Documentation
 
 %define                orgname         qt3d
 %define                qtbase_ver              %{version}
@@ -25,7 +25,7 @@ BuildRequires:        Qt5Qml-devel >= %{qtdeclarative_ver}
 BuildRequires: Qt5Quick-devel >= %{qtdeclarative_ver}
 BuildRequires: assimp-devel
 BuildRequires: pkgconfig
-%if %{with qch}
+%if %{with doc}
 BuildRequires: qt5-assistant >= %{qttools_ver}
 BuildRequires: qt5-doc-common >= %{qttools_ver}
 %endif
@@ -133,15 +133,17 @@ Przykłady do bibliotek Qt5 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
 
 # useless symlinks
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libQt5*.so.5.?
@@ -297,11 +299,11 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/modules/qt_lib_3drender.pri
 %{qt5dir}/mkspecs/modules/qt_lib_3drender_private.pri
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qt3d
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qt3d.qch