[kdelibs] * Fri Aug 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-3 - make building -apidocs-qch optio

Kevin Kofler kkofler at fedoraproject.org
Fri Aug 27 22:41:01 UTC 2010


commit df86e87ee650afb48ba36952b9ce1c285351a65d
Author: Kevin Kofler <Kevin at tigcc.ticalc.org>
Date:   Sat Aug 28 00:40:51 2010 +0200

    * Fri Aug 27 2010 Kevin Kofler <Kevin at tigcc.ticalc.org> - 4.5.1-3
    - make building -apidocs-qch optional and disable it by default until fixed

 kdelibs.spec |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)
---
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 <Kevin at tigcc.ticalc.org> - 4.5.1-3
+- make building -apidocs-qch optional and disable it by default until fixed
+
 * Fri Aug 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4.5.1-2
 - -apidocs : exclude installdox
 


More information about the scm-commits mailing list