# HG changeset patch # User Michael Schloh von Bennewitz # Date 1306679102 -7200 # Node ID 1bee42cde1f72d4c59fe534dbff23ced15b8b0f6 # Parent 90f1326e8f73c7b11450692ad7c79c3739137ecc Make small corrections and improve comments for upcoming package finishing. diff -r 90f1326e8f73 -r 1bee42cde1f7 qt/qt.spec --- a/qt/qt.spec Sun May 29 12:18:03 2011 +0200 +++ b/qt/qt.spec Sun May 29 16:25:02 2011 +0200 @@ -1,6 +1,6 @@ ## ## qt.spec -- OpenPKG RPM Specification -## Copyright (c) 2010 Michael Schloh von Bennewitz +## Copyright (c) 2011 Michael Schloh von Bennewitz ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -56,12 +56,12 @@ # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20050726, make, gcc, pkgconfig -PreReq: OpenPKG, openpkg >= 20050726 +BuildPreReq: OpenPKG, openpkg >= 20060823, make, gcc +PreReq: OpenPKG, openpkg >= 20060823 BuildPreReq: X11, png, mng, jpeg, tiff, mesa, xrender PreReq: X11, png, mng, jpeg, tiff, mesa, xrender -BuildPreReq: openssl, zlib, libiconv, sqlite, dbus -PreReq: openssl, zlib, libiconv, sqlite, dbus +BuildPreReq: pkgconfig, openssl, zlib, libiconv, sqlite, dbus +PreReq: pkgconfig, openssl, zlib, libiconv, sqlite, dbus BuildPreReq: fontconfig, freetype PreReq: fontconfig, freetype %if "%{with_glib}" == "yes" @@ -101,7 +101,7 @@ echo " qt-everywhere-opensource-src-%{version} (6 Go)" echo " qt-%{version}-.--.rpm (2 Go)" echo "Building with no options takes 3,0 hours on a dual core" - echo "2 GHz CPU, or 7,0 hours with all build options enabled." + echo "2 GHz CPU, or 5,0 hours with all build options enabled." ) | %{l_rpmtool} msg -b -t notice %setup -q -n qt-everywhere-opensource-src-%{version} @@ -716,7 +716,7 @@ $RPM_BUILD_ROOT%{l_prefix}/lib/qt/plugins/*/*.prl \ $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \ $RPM_BUILD_ROOT%{l_prefix}/lib/*.la - # keep library paths clean by removing redundant paths + # clean install by removing redundant paths (static libs) %{l_shtool} subst \ -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \ $RPM_BUILD_ROOT%{l_prefix}/lib/*.prl \ @@ -729,7 +729,7 @@ -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}/lib;-L%{l_prefix}/lib/qt/dynamic;' \ $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \ $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.la - # keep library paths clean by removing redundant paths + # clean install by removing redundant paths (dynamic libs) %{l_shtool} subst \ -e 's;-L[\t ]*[^\t ]*qt-everywhere-opensource-src-%{version}[^\t ]*[\t ]*;;g' \ $RPM_BUILD_ROOT%{l_prefix}/lib/qt/dynamic/*.prl \