diff -r f4a0b439d0fb -r dd9efe7d5452 qt/qt.spec
--- a/qt/qt.spec	Fri Oct 15 19:06:09 2010 +0200
+++ b/qt/qt.spec	Sat Oct 16 12:53:55 2010 +0200
@@ -31,10 +31,6 @@
 #   FIXME: MSvB:
 #   FIXME: MSvB: -no-webkit added to broken static buildconf
 #   FIXME: MSvB: as work around for 'ld: cannot find -ljscore'
-#   FIXME: MSvB:
-#   FIXME: MSvB: Test all of -R %{l_prefix}/lib/qt/dynamic,
-#   FIXME: MSvB: -no-rpath, -rpath, and removing $xll_libdir from
-#   FIXME: MSvB: shtool subst. Anschliessend mkspecs/qconfig.pri.
 
 #   package information
 Name:         qt
@@ -47,7 +43,7 @@
 Group:        Development
 License:      GPL
 Version:      4.7.0
-Release:      20101012
+Release:      20101014
 
 #   build options
 %option       with_tools     yes
@@ -99,11 +95,11 @@
 %prep
     #   announce exceptional build requirements
     ( echo "This package has exceptional build requirements:"
-      echo "  qt-%{version}-root (2,5 Go)"
+      echo "  qt-%{version}-root (4,5 Go)"
       echo "  qt-everywhere-opensource-src-%{version} (5,5 Go)"
       echo "  qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (2 Go)"
       echo "Building with no options takes 2,0 hours on a dual core"
-      echo "2 GHz CPU, or 6 hours with all build options enabled."
+      echo "2 GHz CPU, or 5 hours with all build options enabled."
     ) | %{l_rpmtool} msg -b -t notice
 
     %setup -q -n qt-everywhere-opensource-src-%{version}
@@ -130,6 +126,7 @@
         configure
     %{l_shtool} subst \
         -e 's;\(RPATH_FLAGS\)=.*\$QT_INSTALL_LIBS.*\(\$RPATH_FLAGS\)";\1="%{l_prefix}/lib/qt/dynamic \2";' \
+        -e 's;\(QMAKE_RPATHDIR +=\) \\"\$QT_INSTALL_LIBS\\";\1 %{l_prefix}/lib/qt/dynamic;' \
         configure
     %{l_shtool} subst \
         -e 's; *QMakeVar set QMAKE_CFLAGS_X11.*QT_CFLAGS_FONTCONFIG.*;;' \
@@ -222,7 +219,7 @@
     #    -e "s;\(\\title\) All Classes;\1 Qt's Classes;" \
     #    doc/src/classes.qdoc
     %{l_shtool} subst \
-        -e "s;Qt's Classes;All Classes;" \
+        -e "s;Qt.s Classes;All Classes;" \
         tools/assistant/tools/assistant/doc/assistant.qdoc \
         tools/qdoc3/doc/qdoc-manual.qdoc \
         tools/qdoc3/doc/files/qt.qdocconf \
@@ -481,14 +478,14 @@
 %if "%{with_shared}" != "yes"
     %{l_make} %{l_mflags} sub-plugins-install_subtargets-ordered INSTALL_ROOT="$RPM_BUILD_ROOT"
 %else
-    %{l_tar} cf - sharbuild/plugins | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
+    %{l_tar} cf - -C sharbuild plugins | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
 %endif
             
 %if "%{with_shared}" == "yes"
     #   install shared libs and symlinks
     %{l_shtool} mkdir -f -p -m 755 \
         $RPM_BUILD_ROOT%{l_prefix}/lib/qt
-    %{l_tar} cf - sharbuild/dynamic | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
+    %{l_tar} cf - -C sharbuild dynamic | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
 
     #   offer limited support of pkg-config(1) for shared libs
     #   substitution unfortunately only handles paths with no whitespace