[packages/qt5-qtgraphicaleffects] - rename qch bcond to doc (all docs require qtassistant now)
baggins
baggins at pld-linux.org
Tue May 23 11:36:21 CEST 2017
commit 3e4f3628e02cd2525866d291507bcd32db49ca72
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Tue May 23 11:36:05 2017 +0200
- rename qch bcond to doc (all docs require qtassistant now)
qt5-qtgraphicaleffects.spec | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/qt5-qtgraphicaleffects.spec b/qt5-qtgraphicaleffects.spec
index 56328bc..66db1c2 100644
--- a/qt5-qtgraphicaleffects.spec
+++ b/qt5-qtgraphicaleffects.spec
@@ -1,6 +1,6 @@
#
# Conditional build:
-%bcond_without qch # documentation in QCH format
+%bcond_without doc # Documentation
%define orgname qtgraphicaleffects
%define qtbase_ver %{version}
@@ -19,7 +19,7 @@ Source0: http://download.qt.io/official_releases/qt/5.8/%{version}/submodules/%{
URL: http://www.qt.io/
BuildRequires: Qt5Core-devel >= %{qtbase_ver}
BuildRequires: Qt5Quick-devel >= %{qtdeclarative_ver}
-%if %{with qch}
+%if %{with doc}
BuildRequires: qt5-assistant >= %{qttools_ver}
%endif
BuildRequires: qt5-build >= %{qtbase_ver}
@@ -102,16 +102,19 @@ Dokumentacja do modułów Qt5 Graphical Effects 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
@@ -120,11 +123,11 @@ rm -rf $RPM_BUILD_ROOT
%doc dist/changes-*
%{qt5dir}/qml/QtGraphicalEffects
+%if %{with doc}
%files doc
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtgraphicaleffects
-%if %{with qch}
%files doc-qch
%defattr(644,root,root,755)
%{_docdir}/qt5-doc/qtgraphicaleffects.qch
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtgraphicaleffects.git/commitdiff/3e4f3628e02cd2525866d291507bcd32db49ca72
More information about the pld-cvs-commit
mailing list