OpenPKG Specs / changeset

     1.1 --- a/qt/qt.spec	Sat Oct 16 17:18:32 2010 +0200
     1.2 +++ b/qt/qt.spec	Sun Oct 17 23:38:31 2010 +0200
     1.3 @@ -114,7 +114,7 @@
     1.4      esac
     1.5      ( cd mkspecs/qws
     1.6        for plat in freebsd-generic-g++ macx-generic-g++ solaris-generic-g++;
     1.7 -      do 
     1.8 +      do
     1.9            ln -s $plat `echo $plat | %{l_shtool} subst -e 's;\(.*\)-generic-\(.*\);\1-x86-\2;'`
    1.10        done
    1.11      ) || exit $?
    1.12 @@ -196,6 +196,13 @@
    1.13          -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
    1.14          src/corelib/corelib.pro
    1.15      %{l_shtool} subst \
    1.16 +        -e 's;\(DESTDIR *=\) *\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;' \
    1.17 +        src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pro
    1.18 +    %{l_shtool} subst \
    1.19 +        -e 's;\(POST_TARGETDEPS *+\?=\) *\$\${pathToJavaScriptCoreOutput};\1 $$QMAKE_LIBDIR_QT;g' \
    1.20 +        -e 's;\(pathToJavaScriptCoreOutput *=\) *\$\$ARGS/\$\$JAVASCRIPTCORE_DESTDIR;\1 $$QMAKE_LIBDIR_QT;g' \
    1.21 +        src/3rdparty/webkit/JavaScriptCore/JavaScriptCore.pri
    1.22 +    %{l_shtool} subst \
    1.23          -e "s;^\(QMAKE_INCDIR_X11[^=]*=\).*;\1 %{l_prefix}/include $x11_incdir;" \
    1.24          -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\).*;\1 %{l_prefix}/lib $x11_libdir;" \
    1.25          mkspecs/qws/solaris*/qmake.conf \
    1.26 @@ -472,14 +479,22 @@
    1.27  %endif
    1.28      targets="$targets install_qmake install_mkspecs"
    1.29      %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
    1.30 +    %{l_shtool} install -c -m 644 \
    1.31 +        lib/libjscore.a lib/libjscore.prl \
    1.32 +        $RPM_BUILD_ROOT%{l_prefix}/lib/
    1.33  
    1.34 -    #   only install static or shared plugins according to user choice
    1.35 +    #   correct paths in pkg-config(1) configuration files
    1.36 +    %{l_shtool} subst \
    1.37 +        -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version};-L%{l_prefix};g" \
    1.38 +        $RPM_BUILD_ROOT%{l_prefix}/lib/pkgconfig/*
    1.39 +
    1.40 +    #   install static or shared plugins according to user choice
    1.41  %if "%{with_shared}" != "yes"
    1.42      %{l_make} %{l_mflags} sub-plugins-install_subtargets-ordered INSTALL_ROOT="$RPM_BUILD_ROOT"
    1.43  %else
    1.44      %{l_tar} cf - -C sharbuild plugins | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
    1.45  %endif
    1.46 -            
    1.47 +
    1.48  %if "%{with_shared}" == "yes"
    1.49      #   install shared libs and symlinks
    1.50      %{l_shtool} mkdir -f -p -m 755 \
    1.51 @@ -489,6 +504,7 @@
    1.52      #   offer limited support of pkg-config(1) for shared libs
    1.53      #   substitution unfortunately only handles paths with no whitespace
    1.54      %{l_shtool} subst \
    1.55 +        -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;g" \
    1.56          -e "s;-L[^\t ][^\t ]*qt-everywhere-opensource-src-%{version};-L%{l_prefix};g" \
    1.57          $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/pkgconfig/*
    1.58