1.1 --- a/qt/qt.spec Fri Nov 28 12:27:31 2008 +0100
1.2 +++ b/qt/qt.spec Sun Dec 14 13:33:48 2008 +0100
1.3 @@ -33,7 +33,7 @@
1.4 Group: Development
1.5 License: GPL
1.6 Version: 4.4.3
1.7 -Release: 20081124
1.8 +Release: 20081214
1.9
1.10 # build options
1.11 %option with_tools yes
1.12 @@ -50,8 +50,8 @@
1.13 PreReq: OpenPKG, openpkg >= 20050726
1.14 BuildPreReq: X11, png, mng, jpeg, tiff, mesa, xrender
1.15 PreReq: X11, png, mng, jpeg, tiff, mesa, xrender
1.16 -BuildPreReq: zlib, libiconv, sqlite, dbus, glib2
1.17 -PreReq: zlib, libiconv, sqlite, dbus, glib2
1.18 +BuildPreReq: openssl, zlib, libiconv, sqlite, dbus
1.19 +PreReq: openssl, zlib, libiconv, sqlite, dbus
1.20 BuildPreReq: fontconfig, freetype
1.21 PreReq: fontconfig, freetype
1.22 AutoReq: no
1.23 @@ -59,10 +59,10 @@
1.24 Provides: QTSDK
1.25
1.26 %description
1.27 - Qt is a cross-platform application framework. Using Qt, you can
1.28 - develop applications and user interfaces once, and deploy them
1.29 - across many desktop and embedded operating systems without
1.30 - rewriting the source code.
1.31 + Qt is a comprehensive C++ framework for cross-platform application
1.32 + development. Using Qt, you can develop applications and user
1.33 + interfaces once, and deploy them across many desktop and embedded
1.34 + operating systems without rewriting the source code.
1.35
1.36 %track
1.37 prog qt = {
1.38 @@ -78,7 +78,7 @@
1.39 echo " qt-x11-opensource-src-%{version} (4,5 Go)"
1.40 echo " qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (1 Go)"
1.41 echo "Building with no options takes 0,5 hours on a dual core"
1.42 - echo "2 GHz CPU, or 1,5 hours with all build options enabled."
1.43 + echo "2 GHz CPU, or 2 hours with all build options enabled."
1.44 ) | %{l_rpmtool} msg -b -t notice
1.45
1.46 %setup -q -n qt-x11-opensource-src-%{version}
1.47 @@ -137,6 +137,9 @@
1.48 mkspecs/qws/*/qmake.conf \
1.49 mkspecs/*/*.conf
1.50 %{l_shtool} subst \
1.51 + -e 's;^\(QMAKE_LIBS +=.*\);\1 -liconv;' \
1.52 + src/corelib/corelib.pro
1.53 + %{l_shtool} subst \
1.54 -e "s;^\(QMAKE_INCDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/include \2;" \
1.55 -e "s;^\(QMAKE_LIBDIR_X11[^=]*=\) *\(.*\);\1 %{l_prefix}/lib \2 $x11_supdir;" \
1.56 mkspecs/qws/solaris*/qmake.conf \
1.57 @@ -157,13 +160,14 @@
1.58 rm -rf src/3rdparty/[^cdhmsw]* src/3rdparty/sql* src/3rdparty/win*
1.59
1.60 case "%{l_platform -t}" in
1.61 - *-aix* ) platcomp="aix-g++" ;;
1.62 - *-freebsd* ) platcomp="freebsd-g++" ;;
1.63 - *-hpux* ) platcomp="hpux-g++" ;;
1.64 - *-irix* ) platcomp="irix-g++" ;;
1.65 - *-linux* ) platcomp="linux-g++" ;;
1.66 - *-darwin* ) platcomp="macx-g++" ;;
1.67 - *-sunos* ) platcomp="solaris-g++" ;;
1.68 + *-aix* ) platcomp="aix-g++" ;;
1.69 + *-freebsd* ) platcomp="freebsd-g++" ;;
1.70 + *-hpux* ) platcomp="hpux-g++" ;;
1.71 + *-irix* ) platcomp="irix-g++" ;;
1.72 + *64-linux* ) platcomp="linux-g++-64" ;;
1.73 + *-linux* ) platcomp="linux-g++" ;;
1.74 + *-darwin* ) platcomp="macx-g++" ;;
1.75 + *-sunos* ) platcomp="solaris-g++" ;;
1.76 * ) echo "Platform '%{l_platform -t}' is not supported." 2>&1; exit 1 ;;
1.77 esac
1.78
1.79 @@ -185,12 +189,13 @@
1.80 -shared \
1.81 -platform $platcomp \
1.82 -no-sql-ibase \
1.83 - -no-sql-mysql \
1.84 + -qt-sql-mysql \
1.85 -no-sql-odbc \
1.86 -no-sql-psql \
1.87 -no-sql-sqlite2 \
1.88 -qt-sql-sqlite \
1.89 -system-sqlite \
1.90 + -openssl-linked \
1.91 -xmlpatterns \
1.92 -svg \
1.93 -no-webkit \
1.94 @@ -209,8 +214,9 @@
1.95 -xrender \
1.96 -fontconfig \
1.97 -freetype \
1.98 - -glib
1.99 + -no-glib
1.100
1.101 + # sadly, webkit and glib is broken in Qt 4.4.3.
1.102 # default options are implicitly used, und zwar...
1.103 #-no-fast -exceptions -accessibility -stl -qt3support -nis
1.104 #-sm -xshape -xinerama -xcursor -xfixes -xrandr -tablet -xkb
1.105 @@ -252,12 +258,13 @@
1.106 -static \
1.107 -platform $platcomp \
1.108 -no-sql-ibase \
1.109 - -no-sql-mysql \
1.110 + -qt-sql-mysql \
1.111 -no-sql-odbc \
1.112 -no-sql-psql \
1.113 -no-sql-sqlite2 \
1.114 -qt-sql-sqlite \
1.115 -system-sqlite \
1.116 + -openssl-linked \
1.117 -xmlpatterns \
1.118 -svg \
1.119 -no-webkit \
1.120 @@ -276,7 +283,7 @@
1.121 -xrender \
1.122 -fontconfig \
1.123 -freetype \
1.124 - -glib
1.125 + -no-glib
1.126
1.127 # default options are implicitly used, und zwar...
1.128 #-no-fast -exceptions -accessibility -stl -qt3support -nis
1.129 @@ -320,7 +327,7 @@
1.130 %if "%{with_examples}" == "yes"
1.131 targets="$targets sub-demos-install_subtargets-ordered sub-examples-install_subtargets-ordered"
1.132 %endif
1.133 - targets="$targets install_htmldocs install_translations install_qmake install_mkspecs"
1.134 + targets="$targets install_htmldocs install_qchdocs install_docimages install_translations install_qmake install_mkspecs"
1.135 %{l_make} %{l_mflags} $targets INSTALL_ROOT="$RPM_BUILD_ROOT"
1.136
1.137 %if "%{with_shared}" == "yes"
