commit a53e4ea4c7fdc5d08cc94f33969de91683579965
Author: Jan Rękorajski <[email protected]>
Date: Tue May 23 11:29:34 2017 +0200
- rename qch bcond to doc (all docs require qtassistant now)
qt5-qtconnectivity.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtconnectivity.spec b/qt5-qtconnectivity.spec
index 367377b..a349d47 100644
--- a/qt5-qtconnectivity.spec
+++ b/qt5-qtconnectivity.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 qtconnectivity
@@ -24,7 +24,7 @@ BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5DBus-devel >= %{qtbase_ver}
BuildRequires: Qt5Qml-devel >= %{qtdeclarative_ver}
BuildRequires: bluez-libs-devel
-%if %{with qch}
+%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
%endif
BuildRequires: qt5-build >= %{qtbase_ver}
@@ -183,7 +183,7 @@ Przykłady do bibliotek Qt5 Connectivity.
%build
qmake-qt5
%{__make}
-%{__make} %{!?with_qch:html_}docs
+%{?with_doc:%{__make} docs}
%if %{with qm}
cd qttranslations-opensource-src-%{version}
@@ -197,8 +197,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 \
@@ -304,12 +306,12 @@ rm -rf $RPM_BUILD_ROOT
%{qt5dir}/mkspecs/modules/qt_lib_nfc.pri
%{qt5dir}/mkspecs/modules/qt_lib_nfc_private.pri
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtbluetooth
%{_docdir}/qt5-doc/qtnfc
-%if %{with qch}
%files doc-qch
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtbluetooth.qch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtconnectivity.git/commitdiff/a53e4ea4c7fdc5d08cc94f33969de91683579965
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
