Integrate Trolltech's qt_windows fix, add new phrasebooks, and sort config arguments.

qt/qt.spec

@@ -38,7 +38,7 @@ Distribution: OpenPKG [EVAL]
 Group:        XWindow
 License:      GPL
 Version:      3.1.0
-Release:      20021113
+Release:      20021114
 
 #   list of sources
 Source0:      ftp://ftp.silug.org/pub/qt/source/qt-x11-free-%{version}.tar.gz
@@ -97,20 +97,18 @@ AutoReqProv:  no
 
     #   special trolltech configuration
     echo "yes" | ./configure \
-        -prefix %{l_prefix} -release \
+        -prefix %{l_prefix} \
         -docdir %{l_prefix}/share/qt/doc \
-        -static -qt-gif -qt-zlib \
+        -datadir %{l_prefix}/share/qt/data \
-        -platform $oscomp -thread -stl \
+        -static -qt-gif -qt-zlib -platform $oscomp \
-        -qt-libpng -qt-libjpeg -qt-libmng \
+        -L`%{l_prefix}/etc/rc --query x11_libdir` \
-        -no-nas-sound -no-tablet -no-xkb \
+        -R`%{l_prefix}/etc/rc --query x11_libdir` \
+        -thread -stl -qt-libpng -qt-libjpeg -qt-libmng \
 %if "%{with_xft}" == "yes"
-        -xft \
+        -xft
 %else
-        -no-xft \
+        -no-xft
 %endif
-        -sm -xinerama -xrender \
-        -L`%{l_prefix}/etc/rc --query x11_libdir` \
-        -R`%{l_prefix}/etc/rc --query x11_libdir`
 
     #   set $HOME to a writable directory for qsettings
     HOME=$PWD
@@ -130,7 +128,8 @@ AutoReqProv:  no
         $RPM_BUILD_ROOT%{l_prefix}/man/man1 \
         $RPM_BUILD_ROOT%{l_prefix}/man/man3 \
         $RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html \
-        $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates
+        $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates \
+        $RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks
 
     #   copy binaries, headers, and then libraries to their target.
     %{l_shtool} install -c -s -m 755 \
@@ -142,8 +141,6 @@ AutoReqProv:  no
     #   copy mkspecs directory for later portable use of qmake
     cp -rp mkspecs $RPM_BUILD_ROOT%{l_prefix}/share/qt/
 
-    #   qt_windows.h is the only header not copied in the original distribution.
-    rm -f include/qt_windows.h
     %{l_shtool} install -c -m 644 \
         include/*.h $RPM_BUILD_ROOT%{l_prefix}/include/qt/
     %{l_shtool} install -c -m 644 \
@@ -152,6 +149,9 @@ AutoReqProv:  no
         doc/html/* $RPM_BUILD_ROOT%{l_prefix}/share/qt/doc/html/
     %{l_shtool} install -c -m 644 \
         tools/designer/templates/*.ui $RPM_BUILD_ROOT%{l_prefix}/share/qt/templates/
+    %{l_shtool} install -c -m 644 \
+        tools/linguist/phrasebooks/*.qph $RPM_BUILD_ROOT%{l_prefix}/share/qt/phrasebooks/
+    
     ( cd lib && tar cf - * ) |\
     ( cd $RPM_BUILD_ROOT%{l_prefix}/lib && tar xf - )
     ( cd doc/man/man3