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

[baggins]

commit 0718e803384abdb39dfe31287c2c1a9a9dc578e7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 23 11:40:34 2017 +0200

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

 qt5-qtmultimedia.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtmultimedia.spec b/qt5-qtmultimedia.spec
index c3c3a2a..b9991fe 100644
--- a/qt5-qtmultimedia.spec
+++ b/qt5-qtmultimedia.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		qtmultimedia
@@ -33,7 +33,7 @@ BuildRequires:	alsa-lib-devel
 BuildRequires:	gstreamer-devel >= 1.0
 BuildRequires:	gstreamer-plugins-base-devel >= 1.0
 BuildRequires:	pulseaudio-devel
-%if %{with qch}
+%if %{with doc}
 BuildRequires:	qt5-assistant >= %{qttools_ver}
 BuildRequires:	qt5-doc-common >= %{qttools_ver}
 %endif
@@ -238,7 +238,7 @@ Przykłady do bibliotek Qt5 Multimedia.
 qmake-qt5
 
 %{__make}
-%{__make} %{!?with_qch:html_}docs
+%{?with_doc:%{__make} docs}
 
 %if %{with qm}
 cd qttranslations-opensource-src-%{version}
@@ -252,8 +252,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 \
@@ -417,11 +419,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerCaptureServicePlugin.cmake
 %{_libdir}/cmake/Qt5Multimedia/Qt5Multimedia_QGstreamerPlayerServicePlugin.cmake
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtmultimedia
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtmultimedia.qch
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtmultimedia.git/commitdiff/0718e803384abdb39dfe31287c2c1a9a9dc578e7