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

diff --git a/qt5-qtquickcontrols.spec b/qt5-qtquickcontrols.spec
index 27ec781a39c538d8882d5c6ad3758f34f1911870..0b6bf433fff03a348e09d9e77d782b0d6386a966 100644 (file)
--- a/qt5-qtquickcontrols.spec
+++ b/qt5-qtquickcontrols.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without qch     # documentation in QCH format
+%bcond_without doc     # Documentation
 %bcond_without qm      # QM translations
 
 %define                orgname         qtquickcontrols
@@ -25,7 +25,7 @@ BuildRequires:        Qt5Network-devel >= %{qtbase_ver}
 BuildRequires: Qt5Qml-devel >= %{qtdeclarative_ver}
 BuildRequires: Qt5Quick-devel >= %{qtdeclarative_ver}
 BuildRequires: Qt5Widgets-devel >= %{qtbase_ver}
-%if %{with qch}
+%if %{with doc}
 BuildRequires: qt5-assistant >= %{qttools_ver}
 %endif
 BuildRequires: qt5-build >= %{qtbase_ver}
@@ -114,7 +114,7 @@ Dokumentacja do biblioteki Qt5 Quick Controls w formacie QCH.
 %build
 qmake-qt5
 %{__make}
-%{__make} %{!?with_qch:html_}docs
+%{?with_doc:%{__make} docs}
 
 %if %{with qm}
 cd qttranslations-opensource-src-%{version}
@@ -128,8 +128,10 @@ 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
 
 %if %{with qm}
 %{__make} -C qttranslations-opensource-src-%{version} install \
@@ -181,13 +183,13 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/qml/QtQuick/PrivateWidgets/plugins.qmltypes
 %{qt5dir}/qml/QtQuick/PrivateWidgets/qmldir
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtquickcontrols
 %{_docdir}/qt5-doc/qtquickdialogs
 %{_docdir}/qt5-doc/qtquickextras
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtquickcontrols.qch