commit cbf6f77bb536034effddc030325d1d23b0dd0f88
Author: Jan Rękorajski <[email protected]>
Date: Tue May 23 12:16:34 2017 +0200
- rename qch bcond to doc (all docs require qtassistant now)
qt5-qtwebkit.spec | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
---
diff --git a/qt5-qtwebkit.spec b/qt5-qtwebkit.spec
index 4855d73..131cccd 100644
--- a/qt5-qtwebkit.spec
+++ b/qt5-qtwebkit.spec
@@ -8,12 +8,12 @@
# Conditional build:
%bcond_with bootstrap # disable features to able to build without
installed qt5
# -- build targets
-%bcond_without qch # documentation in QCH format
+%bcond_without doc # Documentation
# -- features
%bcond_with qtmultimedia # QtMultimedia support
%if %{with bootstrap}
-%undefine with_qch
+%undefine with_doc
%endif
%define orgname qtwebkit
@@ -59,7 +59,7 @@ BuildRequires: libxml2-devel >= 2.0
BuildRequires: libxslt-devel
BuildRequires: pkgconfig
BuildRequires: rpmbuild(macros) >= 1.654
-%if %{with qch}
+%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
%endif
BuildRequires: qt5-build >= %{qtbase_ver}
@@ -180,15 +180,17 @@ qmake-qt5 \
%{?with_qtmultimedia:WEBKIT_CONFIG+=use_qtmultimedia}
%{__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
# kill unnecessary -L%{_libdir} from *.la, *.prl, *.pc
%{__sed} -i -e "s,-L%{_libdir} \?,,g" \
@@ -240,11 +242,11 @@ rm -rf $RPM_BUILD_ROOT
%{qt5dir}/mkspecs/modules/qt_lib_webkitwidgets.pri
%{qt5dir}/mkspecs/modules/qt_lib_webkitwidgets_private.pri
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtwebkit
-%if %{with qch}
%files doc-qch
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtwebkit.qch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebkit.git/commitdiff/cbf6f77bb536034effddc030325d1d23b0dd0f88
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
