From df86e87ee650afb48ba36952b9ce1c285351a65d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 28 Aug 2010 00:40:51 +0200 Subject: [PATCH] * Fri Aug 27 2010 Kevin Kofler - 4.5.1-3 - make building -apidocs-qch optional and disable it by default until fixed --- kdelibs.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/kdelibs.spec b/kdelibs.spec index a6679ef..2a3fe81 100644 --- a/kdelibs.spec +++ b/kdelibs.spec @@ -7,10 +7,12 @@ %define strigi_ver 0.7.2 # to build/include apidocs or not %define apidocs 1 +# to build/include QCH apidocs or not (currently broken) +#define apidocs_qch 1 Summary: KDE Libraries Version: 4.5.1 -Release: 2%{?dist} +Release: 3%{?dist} Name: kdelibs Epoch: 6 @@ -274,9 +276,13 @@ make %{?_smp_mflags} -C %{_target_platform} # build apidocs %if 0%{?apidocs} export QTDOCDIR=`pkg-config --variable=docdir Qt` +%if 0%{?apidocs_qch} export PROJECT_NAME="%{name}" export PROJECT_VERSION="%{version}%{?alphatag}" doc/api/doxygen.sh --qhppages . +%else +doc/api/doxygen.sh . +%endif %endif @@ -336,6 +342,7 @@ rm -vf %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*.tmp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/index.qhp \ %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/html/index.qhp +%if 0%{?apidocs_qch} mkdir -p %{buildroot}%{_qt4_docdir}/qch for i in %{buildroot}%{_kde4_docdir}/HTML/en/kdelibs4-apidocs/*/qch do @@ -343,6 +350,7 @@ do rmdir "$i" done %endif +%endif %post @@ -486,13 +494,18 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_kde4_docdir}/HTML/en/kdelibs4-apidocs/ +%if 0%{?apidocs_qch} %files apidocs-qch %defattr(-,root,root,-) %{_qt4_docdir}/qch/*.qch %endif +%endif %changelog +* Fri Aug 27 2010 Kevin Kofler - 4.5.1-3 +- make building -apidocs-qch optional and disable it by default until fixed + * Fri Aug 27 2010 Rex Dieter - 4.5.1-2 - -apidocs : exclude installdox