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

baggins baggins at pld-linux.org
Tue May 23 11:37:52 CEST 2017


commit b95d7e948aa9940a7ae0c464fc235348f4528e3e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Tue May 23 11:37:35 2017 +0200

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

 qt5-qtimageformats.spec | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtimageformats.spec b/qt5-qtimageformats.spec
index 4162276..7b828b1 100644
--- a/qt5-qtimageformats.spec
+++ b/qt5-qtimageformats.spec
@@ -1,6 +1,6 @@
 #
 # Conditional build:
-%bcond_without	qch	# documentation in QCH format
+%bcond_without	doc	# Rocumentation
 
 %define		orgname		qtimageformats
 %define		qtbase_ver	%{version}
@@ -21,7 +21,7 @@ BuildRequires:	jasper-devel
 BuildRequires:	libmng-devel
 BuildRequires:	libtiff-devel
 BuildRequires:	libwebp-devel >= 0.4.3
-%if %{with qch}
+%if %{with doc}
 BuildRequires:	qt5-assistant >= %{qttools_ver}
 %endif
 BuildRequires:	qt5-build >= %{qtbase_ver}
@@ -117,15 +117,17 @@ Dokumentacja do wtyczek Qt5 Image Formats w formacie QCH.
 %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
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -150,11 +152,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QWbmpPlugin.cmake
 %{_libdir}/cmake/Qt5Gui/Qt5Gui_QWebpPlugin.cmake
 
+%if %{with doc}
 %files doc
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtimageformats
 
-%if %{with qch}
 %files doc-qch
 %defattr(644,root,root,755)
 %{_docdir}/qt5-doc/qtimageformats.qch
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtimageformats.git/commitdiff/b95d7e948aa9940a7ae0c464fc235348f4528e3e



More information about the pld-cvs-commit mailing list