1.1 --- a/qt/qt.spec Fri Oct 08 23:24:07 2010 +0200
1.2 +++ b/qt/qt.spec Sat Oct 09 11:28:53 2010 +0200
1.3 @@ -30,6 +30,7 @@
1.4 # FIXME: MSvB: AMD64 builds succeed.
1.5 # FIXME: MSvB:
1.6 # FIXME: MSvB: -no-webkit added to broken static buildconf
1.7 +# FIXME: MSvB: as work around for 'ld: cannot find -ljscore'
1.8
1.9 # package information
1.10 Name: qt
1.11 @@ -413,15 +414,23 @@
1.12 #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
1.13
1.14 # carry out static build procedure
1.15 - %{l_make} %{l_mflags -O} sub-src sub-translations
1.16 + %{l_make} %{l_mflags -O} sub-src
1.17 %if "%{with_tools}" == "yes"
1.18 - %{l_make} %{l_mflags -O} sub-tools-make_default-ordered
1.19 + %{l_make} %{l_mflags -O} \
1.20 + sub-tools-make_default-ordered sub-translations-make_default-ordered
1.21 %endif
1.22 %if "%{with_examples}" == "yes"
1.23 %{l_make} %{l_mflags -O} \
1.24 sub-demos-make_default-ordered \
1.25 sub-examples-make_default-ordered
1.26 %endif
1.27 +%if "%{with_tools}" == "yes"
1.28 + %{l_make} %{l_mflags -O} docs
1.29 +%else
1.30 +%if "%{with_examples}" == "yes"
1.31 + %{l_make} %{l_mflags -O} docs
1.32 +%endif
1.33 +%endif
1.34
1.35 %install
1.36 rm -rf $RPM_BUILD_ROOT
1.37 @@ -452,18 +461,15 @@
1.38 sub-translations-install_subtargets-ordered"
1.39
1.40 %if "%{with_tools}" == "yes"
1.41 - targets="$targets sub-tools-install_subtargets-ordered sub-tools-qdoc3-install_subtargets-ordered"
1.42 + targets="$targets sub-tools-install_subtargets-ordered install_htmldocs install_qchdocs install_docimages"
1.43 %endif
1.44 %if "%{with_examples}" == "yes"
1.45 - targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered"
1.46 + targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered install_htmldocs install_qchdocs install_docimages"
1.47 %endif
1.48 - targets="$targets install_htmldocs install_qchdocs install_docimages install_qmake install_mkspecs"
1.49 + targets="$targets install_qmake install_mkspecs"
1.50 %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
1.51
1.52 %if "%{with_shared}" == "yes"
1.53 -# # install components only built against shared libs
1.54 -# targets="$targets irgend-was-webkit_subtargets-ordered"
1.55 -
1.56 # install shared libs and symlinks
1.57 %{l_shtool} mkdir -f -p -m 755 \
1.58 $RPM_BUILD_ROOT%{l_prefix}/lib/qt
