commit a0bb59d82b02c62cb6d0508e001ad8a4036aee25
Author: Jan Rękorajski <[email protected]>
Date: Tue May 23 12:13:58 2017 +0200
- rename qch bcond to doc (all docs require qtassistant now)
qt5-qtwebchannel.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtwebchannel.spec b/qt5-qtwebchannel.spec
index f8f573a..8a27c72 100644
--- a/qt5-qtwebchannel.spec
+++ b/qt5-qtwebchannel.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without qch # documentation in QCH format
+%bcond_without doc # Documentation
%define orgname qtwebchannel
%define qtbase_ver %{version}
@@ -20,7 +20,7 @@ BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Network-devel >= %{qtbase_ver}
BuildRequires: Qt5Qml-devel >= %{qtdeclarative_ver}
BuildRequires: Qt5Quick-devel >= %{qtdeclarative_ver}
-%if %{with qch}
+%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
%endif
BuildRequires: qt5-build >= %{qtbase_ver}
@@ -129,15 +129,17 @@ Przykłady do biblioteki Qt5 WebChannel.
%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.?
@@ -195,11 +197,11 @@ rm -rf $RPM_BUILD_ROOT
%{qt5dir}/mkspecs/modules/qt_lib_webchannel.pri
%{qt5dir}/mkspecs/modules/qt_lib_webchannel_private.pri
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtwebchannel
-%if %{with qch}
%files doc-qch
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtwebchannel.qch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebchannel.git/commitdiff/a0bb59d82b02c62cb6d0508e001ad8a4036aee25
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
