diff -r 415696e65b05 -r c2e6bf16b6f4 qt/qt.spec
--- a/qt/qt.spec	Fri Nov 28 12:27:31 2008 +0100
+++ b/qt/qt.spec	Sun Dec 14 13:33:48 2008 +0100
@@ -33,7 +33,7 @@
 Group:        Development
 License:      GPL
 Version:      4.4.3
-Release:      20081124
+Release:      20081214
 
 #   build options
 %option       with_tools     yes
@@ -50,8 +50,8 @@
 PreReq:       OpenPKG, openpkg >= 20050726
 BuildPreReq:  X11, png, mng, jpeg, tiff, mesa, xrender
 PreReq:       X11, png, mng, jpeg, tiff, mesa, xrender
-BuildPreReq:  zlib, libiconv, sqlite, dbus, glib2
-PreReq:       zlib, libiconv, sqlite, dbus, glib2
+BuildPreReq:  openssl, zlib, libiconv, sqlite, dbus
+PreReq:       openssl, zlib, libiconv, sqlite, dbus
 BuildPreReq:  fontconfig, freetype
 PreReq:       fontconfig, freetype
 AutoReq:      no
@@ -59,10 +59,10 @@
 Provides:     QTSDK
 
 %description
-    Qt is a cross-platform application framework. Using Qt, you can
-    develop applications and user interfaces once, and deploy them
-    across many desktop and embedded operating systems without
-    rewriting the source code.
+    Qt is a comprehensive C++ framework for cross-platform application
+    development. Using Qt, you can develop applications and user
+    interfaces once, and deploy them across many desktop and embedded
+    operating systems without rewriting the source code.
 
 %track
     prog qt = {
@@ -78,7 +78,7 @@
       echo "  qt-x11-opensource-src-%{version} (4,5 Go)"
       echo "  qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (1 Go)"
       echo "Building with no options takes 0,5 hours on a dual core"
-      echo "2 GHz CPU, or 1,5 hours with all build options enabled."
+      echo "2 GHz CPU, or 2 hours with all build options enabled."
     ) | %{l_rpmtool} msg -b -t notice
 
     %setup -q -n qt-x11-opensource-src-%{version}
@@ -137,6 +137,9 @@
         mkspecs/qws/*/qmake.conf \
         mkspecs/*/*.conf
     %{l_shtool} subst \
+        -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
+        src/corelib/corelib.pro
+    %{l_shtool} subst \
         -e "s;^\(QMAKE_INCDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/include \2;" \
         -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/lib \2 $x11_supdir;" \
         mkspecs/qws/solaris*/qmake.conf \
@@ -157,13 +160,14 @@
     rm -rf src/3rdparty/[^cdhmsw]* src/3rdparty/sql* src/3rdparty/win*
 
     case "%{l_platform -t}" in
-        *-aix*     ) platcomp="aix-g++"     ;;
-        *-freebsd* ) platcomp="freebsd-g++" ;;
-        *-hpux*    ) platcomp="hpux-g++"    ;;
-        *-irix*    ) platcomp="irix-g++"    ;;
-        *-linux*   ) platcomp="linux-g++"   ;;
-        *-darwin*  ) platcomp="macx-g++"    ;;
-        *-sunos*   ) platcomp="solaris-g++" ;;
+        *-aix*     ) platcomp="aix-g++"      ;;
+        *-freebsd* ) platcomp="freebsd-g++"  ;;
+        *-hpux*    ) platcomp="hpux-g++"     ;;
+        *-irix*    ) platcomp="irix-g++"     ;;
+        *64-linux* ) platcomp="linux-g++-64" ;;
+        *-linux*   ) platcomp="linux-g++"    ;;
+        *-darwin*  ) platcomp="macx-g++"     ;;
+        *-sunos*   ) platcomp="solaris-g++"  ;;
         *          ) echo "Platform '%{l_platform -t}' is not supported." 2>&1; exit 1 ;;
     esac
 
@@ -185,12 +189,13 @@
         -shared \
         -platform $platcomp \
         -no-sql-ibase \
-        -no-sql-mysql \
+        -qt-sql-mysql \
         -no-sql-odbc \
         -no-sql-psql \
         -no-sql-sqlite2 \
         -qt-sql-sqlite \
         -system-sqlite \
+        -openssl-linked \
         -xmlpatterns \
         -svg \
         -no-webkit \
@@ -209,8 +214,9 @@
         -xrender \
         -fontconfig \
         -freetype \
-        -glib
+        -no-glib
 
+    #   sadly, webkit and glib is broken in Qt 4.4.3.
     #   default options are implicitly used, und zwar...
     #-no-fast -exceptions -accessibility -stl -qt3support -nis
     #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
@@ -252,12 +258,13 @@
         -static \
         -platform $platcomp \
         -no-sql-ibase \
-        -no-sql-mysql \
+        -qt-sql-mysql \
         -no-sql-odbc \
         -no-sql-psql \
         -no-sql-sqlite2 \
         -qt-sql-sqlite \
         -system-sqlite \
+        -openssl-linked \
         -xmlpatterns \
         -svg \
         -no-webkit \
@@ -276,7 +283,7 @@
         -xrender \
         -fontconfig \
         -freetype \
-        -glib
+        -no-glib
 
     #   default options are implicitly used, und zwar...
     #-no-fast -exceptions -accessibility -stl -qt3support -nis
@@ -320,7 +327,7 @@
 %if "%{with_examples}" == "yes"
     targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered"
 %endif
-    targets="$targets install_htmldocs install_translations install_qmake install_mkspecs"
+    targets="$targets install_htmldocs install_qchdocs install_docimages install_translations install_qmake install_mkspecs"
     %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
 
 %if "%{with_shared}" == "yes"