[packages/qt5-qtserialport] - rename qch bcond to doc (all docs require qtassistant now)
baggins
baggins at pld-linux.org
Tue May 23 12:10:08 CEST 2017
commit 60cff228d324742de86da6f71b917ded4db9edc4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue May 23 12:09:34 2017 +0200
- rename qch bcond to doc (all docs require qtassistant now)
qt5-qtserialport.spec | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtserialport.spec b/qt5-qtserialport.spec
index 828b69f..4aacf2a 100644
--- a/qt5-qtserialport.spec
+++ b/qt5-qtserialport.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without qch # documentation in QCH format
+%bcond_without doc # Documentation
%define orgname qtserialport
%define qtbase_ver %{version}
@@ -18,7 +18,7 @@ URL: http://www.qt.io/
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Gui-devel >= %{qtbase_ver}
BuildRequires: Qt5Widgets-devel >= %{qtbase_ver}
-%if %{with qch}
+%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
%endif
BuildRequires: qt5-build >= %{qtbase_ver}
@@ -127,15 +127,17 @@ Przykłady do biblioteki Qt5 SerialPort.
%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.?
@@ -164,11 +166,11 @@ rm -rf $RPM_BUILD_ROOT
%{qt5dir}/mkspecs/modules/qt_lib_serialport.pri
%{qt5dir}/mkspecs/modules/qt_lib_serialport_private.pri
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtserialport
-%if %{with qch}
%files doc-qch
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtserialport.qch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtserialport.git/commitdiff/60cff228d324742de86da6f71b917ded4db9edc4
More information about the pld-cvs-commit
mailing list