1.1 --- a/qt/qt.spec Tue Sep 22 11:10:44 2009 +0200
1.2 +++ b/qt/qt.spec Fri Oct 02 14:31:07 2009 +0200
1.3 @@ -43,8 +43,8 @@
1.4 Class: EVAL
1.5 Group: Development
1.6 License: GPL
1.7 -Version: 4.5.2
1.8 -Release: 20090718
1.9 +Version: 4.5.3
1.10 +Release: 20091001
1.11
1.12 # build options
1.13 %option with_tools yes
1.14 @@ -267,6 +267,7 @@
1.15 -openssl-linked \
1.16 -xmlpatterns \
1.17 -svg \
1.18 + -webkit \
1.19 -system-zlib \
1.20 -qt-gif \
1.21 -system-libpng \
1.22 @@ -291,11 +292,12 @@
1.23 # carry out shared build procedure
1.24 ( cd src
1.25 %{l_make} %{l_mflags -O} \
1.26 - sub-moc sub-rcc sub-uic
1.27 + sub-moc sub-rcc sub-uic sub-uic3
1.28 %{l_make} %{l_mflags -O} \
1.29 sub-corelib sub-xml sub-network sub-gui sub-sql \
1.30 sub-script sub-testlib sub-qt3support sub-dbus \
1.31 - sub-opengl sub-xmlpatterns sub-svg sub-plugins
1.32 + sub-opengl sub-xmlpatterns sub-svg sub-plugins \
1.33 + sub-webkit sub-scripttools
1.34 ) || exit $?
1.35
1.36 # arthur plugin requires libQtDesigner
1.37 @@ -355,6 +357,7 @@
1.38 -openssl-linked \
1.39 -xmlpatterns \
1.40 -svg \
1.41 + -webkit \
1.42 -system-zlib \
1.43 -qt-gif \
1.44 -system-libpng \
1.45 @@ -391,7 +394,8 @@
1.46 rm -rf $RPM_BUILD_ROOT
1.47
1.48 # carry out installation procedure
1.49 - targets="sub-moc-install_subtargets-ordered \
1.50 + targets="sub-tools-bootstrap-install_subtargets-ordered \
1.51 + sub-moc-install_subtargets-ordered \
1.52 sub-rcc-install_subtargets-ordered \
1.53 sub-uic-install_subtargets-ordered \
1.54 sub-corelib-install_subtargets-ordered \
1.55 @@ -407,14 +411,16 @@
1.56 sub-opengl-install_subtargets-ordered \
1.57 sub-xmlpatterns-install_subtargets-ordered \
1.58 sub-svg-install_subtargets-ordered \
1.59 + sub-webkit-install_subtargets-ordered \
1.60 + sub-scripttools-install_subtargets-ordered \
1.61 sub-plugins-install_subtargets-ordered"
1.62 %if "%{with_tools}" == "yes"
1.63 - targets="$targets sub-tools-install_subtargets-ordered"
1.64 + targets="$targets sub-tools-install_subtargets-ordered sub-tools-qdoc3-install_subtargets-ordered"
1.65 %endif
1.66 %if "%{with_examples}" == "yes"
1.67 targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered"
1.68 %endif
1.69 - targets="$targets install_htmldocs install_qchdocs install_docimages install_translations install_qmake install_mkspecs"
1.70 + targets="$targets install_htmldocs install_qchdocs install_docimages install_qmake install_mkspecs"
1.71 %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
1.72
1.73 %if "%{with_shared}" == "yes"
