diff -r 4d116d09a000 -r 6f5a2a90bb46 qt/qt.spec --- a/qt/qt.spec Tue Sep 22 11:10:44 2009 +0200 +++ b/qt/qt.spec Fri Oct 02 14:31:07 2009 +0200 @@ -43,8 +43,8 @@ Class: EVAL Group: Development License: GPL -Version: 4.5.2 -Release: 20090718 +Version: 4.5.3 +Release: 20091001 # build options %option with_tools yes @@ -267,6 +267,7 @@ -openssl-linked \ -xmlpatterns \ -svg \ + -webkit \ -system-zlib \ -qt-gif \ -system-libpng \ @@ -291,11 +292,12 @@ # carry out shared build procedure ( cd src %{l_make} %{l_mflags -O} \ - sub-moc sub-rcc sub-uic + sub-moc sub-rcc sub-uic sub-uic3 %{l_make} %{l_mflags -O} \ sub-corelib sub-xml sub-network sub-gui sub-sql \ sub-script sub-testlib sub-qt3support sub-dbus \ - sub-opengl sub-xmlpatterns sub-svg sub-plugins + sub-opengl sub-xmlpatterns sub-svg sub-plugins \ + sub-webkit sub-scripttools ) || exit $? # arthur plugin requires libQtDesigner @@ -355,6 +357,7 @@ -openssl-linked \ -xmlpatterns \ -svg \ + -webkit \ -system-zlib \ -qt-gif \ -system-libpng \ @@ -391,7 +394,8 @@ rm -rf $RPM_BUILD_ROOT # carry out installation procedure - targets="sub-moc-install_subtargets-ordered \ + targets="sub-tools-bootstrap-install_subtargets-ordered \ + sub-moc-install_subtargets-ordered \ sub-rcc-install_subtargets-ordered \ sub-uic-install_subtargets-ordered \ sub-corelib-install_subtargets-ordered \ @@ -407,14 +411,16 @@ sub-opengl-install_subtargets-ordered \ sub-xmlpatterns-install_subtargets-ordered \ sub-svg-install_subtargets-ordered \ + sub-webkit-install_subtargets-ordered \ + sub-scripttools-install_subtargets-ordered \ sub-plugins-install_subtargets-ordered" %if "%{with_tools}" == "yes" - targets="$targets sub-tools-install_subtargets-ordered" + targets="$targets sub-tools-install_subtargets-ordered sub-tools-qdoc3-install_subtargets-ordered" %endif %if "%{with_examples}" == "yes" targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered" %endif - targets="$targets install_htmldocs install_qchdocs install_docimages install_translations install_qmake install_mkspecs" + targets="$targets install_htmldocs install_qchdocs install_docimages install_qmake install_mkspecs" %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT" %if "%{with_shared}" == "yes"