1.1 --- a/qt/qt.spec Fri Oct 15 19:06:09 2010 +0200
1.2 +++ b/qt/qt.spec Sat Oct 16 12:53:55 2010 +0200
1.3 @@ -31,10 +31,6 @@
1.4 # FIXME: MSvB:
1.5 # FIXME: MSvB: -no-webkit added to broken static buildconf
1.6 # FIXME: MSvB: as work around for 'ld: cannot find -ljscore'
1.7 -# FIXME: MSvB:
1.8 -# FIXME: MSvB: Test all of -R %{l_prefix}/lib/qt/dynamic,
1.9 -# FIXME: MSvB: -no-rpath, -rpath, and removing $xll_libdir from
1.10 -# FIXME: MSvB: shtool subst. Anschliessend mkspecs/qconfig.pri.
1.11
1.12 # package information
1.13 Name: qt
1.14 @@ -47,7 +43,7 @@
1.15 Group: Development
1.16 License: GPL
1.17 Version: 4.7.0
1.18 -Release: 20101012
1.19 +Release: 20101014
1.20
1.21 # build options
1.22 %option with_tools yes
1.23 @@ -99,11 +95,11 @@
1.24 %prep
1.25 # announce exceptional build requirements
1.26 ( echo "This package has exceptional build requirements:"
1.27 - echo " qt-%{version}-root (2,5 Go)"
1.28 + echo " qt-%{version}-root (4,5 Go)"
1.29 echo " qt-everywhere-opensource-src-%{version} (5,5 Go)"
1.30 echo " qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (2 Go)"
1.31 echo "Building with no options takes 2,0 hours on a dual core"
1.32 - echo "2 GHz CPU, or 6 hours with all build options enabled."
1.33 + echo "2 GHz CPU, or 5 hours with all build options enabled."
1.34 ) | %{l_rpmtool} msg -b -t notice
1.35
1.36 %setup -q -n qt-everywhere-opensource-src-%{version}
1.37 @@ -130,6 +126,7 @@
1.38 configure
1.39 %{l_shtool} subst \
1.40 -e 's;\(RPATH_FLAGS\)=.*\$QT_INSTALL_LIBS.*\(\$RPATH_FLAGS\)";\1="%{l_prefix}/lib/qt/dynamic \2";' \
1.41 + -e 's;\(QMAKE_RPATHDIR +=\) \\"\$QT_INSTALL_LIBS\\";\1 %{l_prefix}/lib/qt/dynamic;' \
1.42 configure
1.43 %{l_shtool} subst \
1.44 -e 's; *QMakeVar set QMAKE_CFLAGS_X11.*QT_CFLAGS_FONTCONFIG.*;;' \
1.45 @@ -222,7 +219,7 @@
1.46 # -e "s;\(\\title\) All Classes;\1 Qt's Classes;" \
1.47 # doc/src/classes.qdoc
1.48 %{l_shtool} subst \
1.49 - -e "s;Qt's Classes;All Classes;" \
1.50 + -e "s;Qt.s Classes;All Classes;" \
1.51 tools/assistant/tools/assistant/doc/assistant.qdoc \
1.52 tools/qdoc3/doc/qdoc-manual.qdoc \
1.53 tools/qdoc3/doc/files/qt.qdocconf \
1.54 @@ -481,14 +478,14 @@
1.55 %if "%{with_shared}" != "yes"
1.56 %{l_make} %{l_mflags} sub-plugins-install_subtargets-ordered INSTALL_ROOT="$RPM_BUILD_ROOT"
1.57 %else
1.58 - %{l_tar} cf - sharbuild/plugins | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
1.59 + %{l_tar} cf - -C sharbuild plugins | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
1.60 %endif
1.61
1.62 %if "%{with_shared}" == "yes"
1.63 # install shared libs and symlinks
1.64 %{l_shtool} mkdir -f -p -m 755 \
1.65 $RPM_BUILD_ROOT%{l_prefix}/lib/qt
1.66 - %{l_tar} cf - sharbuild/dynamic | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
1.67 + %{l_tar} cf - -C sharbuild dynamic | %{l_tar} xf - -C $RPM_BUILD_ROOT%{l_prefix}/lib/qt
1.68
1.69 # offer limited support of pkg-config(1) for shared libs
1.70 # substitution unfortunately only handles paths with no whitespace
