1.1 --- a/qt/qt.spec Sun May 29 12:18:03 2011 +0200
1.2 +++ b/qt/qt.spec Sun May 29 16:25:02 2011 +0200
1.3 @@ -1,6 +1,6 @@
1.4 ##
1.5 ## qt.spec -- OpenPKG RPM Specification
1.6 -## Copyright (c) 2010 Michael Schloh von Bennewitz <michael@schloh.com>
1.7 +## Copyright (c) 2011 Michael Schloh von Bennewitz <michael@schloh.com>
1.8 ##
1.9 ## Permission to use, copy, modify, and distribute this software for
1.10 ## any purpose with or without fee is hereby granted, provided that
1.11 @@ -56,12 +56,12 @@
1.12 # build information
1.13 Prefix: %{l_prefix}
1.14 BuildRoot: %{l_buildroot}
1.15 -BuildPreReq: OpenPKG, openpkg >= 20050726, make, gcc, pkgconfig
1.16 -PreReq: OpenPKG, openpkg >= 20050726
1.17 +BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc
1.18 +PreReq: OpenPKG, openpkg >= 20060823
1.19 BuildPreReq: X11, png, mng, jpeg, tiff, mesa, xrender
1.20 PreReq: X11, png, mng, jpeg, tiff, mesa, xrender
1.21 -BuildPreReq: openssl, zlib, libiconv, sqlite, dbus
1.22 -PreReq: openssl, zlib, libiconv, sqlite, dbus
1.23 +BuildPreReq: pkgconfig, openssl, zlib, libiconv, sqlite, dbus
1.24 +PreReq: pkgconfig, openssl, zlib, libiconv, sqlite, dbus
1.25 BuildPreReq: fontconfig, freetype
1.26 PreReq: fontconfig, freetype
1.27 %if "%{with_glib}" == "yes"
1.28 @@ -101,7 +101,7 @@
1.29 echo " qt-everywhere-opensource-src-%{version} (6 Go)"
1.30 echo " qt-%{version}-<date>.<arch>-<os>-<tag>.rpm (2 Go)"
1.31 echo "Building with no options takes 3,0 hours on a dual core"
1.32 - echo "2 GHz CPU, or 7,0 hours with all build options enabled."
1.33 + echo "2 GHz CPU, or 5,0 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 @@ -716,7 +716,7 @@
1.38 $RPM_BUILD_ROOT%{l_prefix}/lib/qt/plugins/*/*.prl \
1.39 $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \
1.40 $RPM_BUILD_ROOT%{l_prefix}/lib/*.la
1.41 - # keep library paths clean by removing redundant paths
1.42 + # clean install by removing redundant paths (static libs)
1.43 %{l_shtool} subst \
1.44 -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \
1.45 $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \
1.46 @@ -729,7 +729,7 @@
1.47 -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;' \
1.48 $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \
1.49 $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.la
1.50 - # keep library paths clean by removing redundant paths
1.51 + # clean install by removing redundant paths (dynamic libs)
1.52 %{l_shtool} subst \
1.53 -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \
1.54 $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \
