From de8a9faab947a64e9f6789c74150c563f93996df Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Tue, 23 May 2017 12:15:14 +0200 Subject: [PATCH] - rename qch bcond to doc (all docs require qtassistant now) --- qt5-qtwebengine.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 54e2079..664bb71 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -1,6 +1,6 @@ # # Conditional build: -%bcond_without qch # documentation in QCH format +%bcond_without doc # Documentation %define orgname qtwebengine %define qtbase_ver %{version} @@ -24,7 +24,7 @@ BuildRequires: Qt5Qml-devel >= %{qtdeclarative_ver} BuildRequires: Qt5Quick-devel >= %{qtdeclarative_ver} BuildRequires: Qt5WebChannel-devel >= %{qtwebchannel_ver} BuildRequires: Qt5Widgets-devel >= %{qtbase_ver} -%if %{with qch} +%if %{with doc} BuildRequires: qt5-assistant >= %{qttools_ver} %endif BuildRequires: qt5-build >= %{qtbase_ver} @@ -133,15 +133,17 @@ Przykłady do biblioteki Qt5 WebEngine. %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.? @@ -199,11 +201,11 @@ rm -rf $RPM_BUILD_ROOT %{qt5dir}/mkspecs/modules/qt_lib_webengine.pri %{qt5dir}/mkspecs/modules/qt_lib_webengine_private.pri +%if %{with doc} %files doc %defattr(644,root,root,755) %{_docdir}/qt5-doc/qtwebengine -%if %{with qch} %files doc-qch %defattr(644,root,root,755) %{_docdir}/qt5-doc/qtwebengine.qch -- 2.44.0