[packages/qt5-qtxmlpatterns] - rename qch bcond to doc (all docs require qtassistant now)

baggins baggins at pld-linux.org
Tue May 23 12:20:23 CEST 2017


commit 07abe1adf17ffbe76c383e1e04b8f66c1b5b82fa
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 23 12:20:15 2017 +0200

    - rename qch bcond to doc (all docs require qtassistant now)

 qt5-qtxmlpatterns.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtxmlpatterns.spec b/qt5-qtxmlpatterns.spec
index bc0246e..7806cf3 100644
--- a/qt5-qtxmlpatterns.spec
+++ b/qt5-qtxmlpatterns.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		qtxmlpatterns
@@ -23,7 +23,7 @@ BuildRequires:	Qt5Core-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Gui-devel >= %{qtbase_ver}
 BuildRequires:	Qt5Network-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}
@@ -133,7 +133,7 @@ Przykłady do biblioteki Qt5 XmlPatterns.
 %build
 qmake-qt5
 %{__make}
-%{__make} %{!?with_qch:html_}docs
+%{?with_doc:%{__make} docs}
 
 %if %{with qm}
 cd qttranslations-opensource-src-%{version}
@@ -147,8 +147,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 \
@@ -234,11 +236,11 @@ rm -rf $RPM_BUILD_ROOT
 %{qt5dir}/mkspecs/modules/qt_lib_xmlpatterns.pri
 %{qt5dir}/mkspecs/modules/qt_lib_xmlpatterns_private.pri
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtxmlpatterns
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtxmlpatterns.qch
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtxmlpatterns.git/commitdiff/07abe1adf17ffbe76c383e1e04b8f66c1b5b82fa



More information about the pld-cvs-commit mailing list