# HG changeset patch # User Michael Schloh von Bennewitz # Date 1286616533 -7200 # Node ID 85dc84aeb23f8519951d5503d8bff84518e99171 # Parent 00697b7997116687085084d1df92b1d717835cde Correct logic to build and install docs and translations. diff -r 00697b799711 -r 85dc84aeb23f qt/qt.spec --- a/qt/qt.spec Fri Oct 08 23:24:07 2010 +0200 +++ b/qt/qt.spec Sat Oct 09 11:28:53 2010 +0200 @@ -30,6 +30,7 @@ # FIXME: MSvB: AMD64 builds succeed. # FIXME: MSvB: # FIXME: MSvB: -no-webkit added to broken static buildconf +# FIXME: MSvB: as work around for 'ld: cannot find -ljscore' # package information Name: qt @@ -413,15 +414,23 @@ #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb # carry out static build procedure - %{l_make} %{l_mflags -O} sub-src sub-translations + %{l_make} %{l_mflags -O} sub-src %if "%{with_tools}" == "yes" - %{l_make} %{l_mflags -O} sub-tools-make_default-ordered + %{l_make} %{l_mflags -O} \ + sub-tools-make_default-ordered sub-translations-make_default-ordered %endif %if "%{with_examples}" == "yes" %{l_make} %{l_mflags -O} \ sub-demos-make_default-ordered \ sub-examples-make_default-ordered %endif +%if "%{with_tools}" == "yes" + %{l_make} %{l_mflags -O} docs +%else +%if "%{with_examples}" == "yes" + %{l_make} %{l_mflags -O} docs +%endif +%endif %install rm -rf $RPM_BUILD_ROOT @@ -452,18 +461,15 @@ sub-translations-install_subtargets-ordered" %if "%{with_tools}" == "yes" - targets="$targets sub-tools-install_subtargets-ordered sub-tools-qdoc3-install_subtargets-ordered" + targets="$targets sub-tools-install_subtargets-ordered install_htmldocs install_qchdocs install_docimages" %endif %if "%{with_examples}" == "yes" - targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered" + targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered install_htmldocs install_qchdocs install_docimages" %endif - targets="$targets install_htmldocs install_qchdocs install_docimages install_qmake install_mkspecs" + targets="$targets install_qmake install_mkspecs" %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT" %if "%{with_shared}" == "yes" -# # install components only built against shared libs -# targets="$targets irgend-was-webkit_subtargets-ordered" - # install shared libs and symlinks %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/lib/qt