diff -r 236b41bfb628 -r 00db87db5e04 qt/qt.spec
--- a/qt/qt.spec	Sat Oct 16 17:18:32 2010 +0200
+++ b/qt/qt.spec	Sun Oct 17 23:38:31 2010 +0200
@@ -114,7 +114,7 @@
     esac
     ( cd mkspecs/qws
       for plat in freebsd-generic-g++ macx-generic-g++ solaris-generic-g++;
-      do 
+      do
           ln -s $plat `echo $plat | %{l_shtool} subst -e 's;\(.*\)-generic-\(.*\);\1-x86-\2;'`
       done
     ) || exit $?
@@ -196,6 +196,13 @@
         -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
         src/corelib/corelib.pro
     %{l_shtool} subst \
+        -e 's;\(DESTDIR *=\) *\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;' \
+        src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
+    %{l_shtool} subst \
+        -e 's;\(POST_TARGETDEPS *+\?=\) *\$\${pathToJavaScriptCoreOutput};\1 $$QMAKE_LIBDIR_QT;g' \
+        -e 's;\(pathToJavaScriptCoreOutput *=\) *\$\$ARGS/\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;g' \
+        src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
+    %{l_shtool} subst \
         -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 %{l_prefix}/include $x11_incdir;" \
         -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 %{l_prefix}/lib $x11_libdir;" \
         mkspecs/qws/solaris*/qmake.conf \
@@ -472,14 +479,22 @@
 %endif
     targets="$targets install_qmake install_mkspecs"
     %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
+    %{l_shtool} install -c -m 644 \
+        lib/libjscore.a lib/libjscore.prl \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/
 
-    #   only install static or shared plugins according to user choice
+    #   correct paths in pkg-config(1) configuration files
+    %{l_shtool} subst \
+        -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version};-L%{l_prefix};g" \
+        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/*
+
+    #   install static or shared plugins according to user choice
 %if "%{with_shared}" != "yes"
     %{l_make} %{l_mflags} sub-plugins-install_subtargets-ordered INSTALL_ROOT="$RPM_BUILD_ROOT"
 %else
     %{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 \
@@ -489,6 +504,7 @@
     #   offer limited support of pkg-config(1) for shared libs
     #   substitution unfortunately only handles paths with no whitespace
     %{l_shtool} subst \
+        -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;g" \
         -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version};-L%{l_prefix};g" \
         $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/pkgconfig/*