diff -r a6252f20c559 -r 2a1b1cf8080a qtcreator/qtcreator.spec --- a/qtcreator/qtcreator.spec Sun Oct 10 18:19:47 2010 +0200 +++ b/qtcreator/qtcreator.spec Sun Oct 10 18:21:45 2010 +0200 @@ -31,17 +31,17 @@ Class: EVAL Group: Development License: GPL -Version: 1.2.90 -Release: 20091014 +Version: 2.0.1 +Release: 20101010 # list of sources -Source0: ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tar.gz +Source0: ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tgz # build information Prefix: %{l_prefix} BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20050726, qt, gcc -PreReq: OpenPKG, openpkg >= 20050726, qt +BuildPreReq: OpenPKG, openpkg >= 20050726, QTSDK, gcc +PreReq: OpenPKG, openpkg >= 20050726, QTSDK AutoReq: no AutoReqProv: no @@ -63,7 +63,7 @@ %prep %setup -q -n qt-creator-%{version}-src %{l_shtool} subst \ - -e 's;\(CONFIG[\ \t]*+=\)\(.*\);\1 static\2;' \ + -e 's;\(CONFIG[\ \t]*+=\)[\ \t]*\(.*\);\1 static \2;' \ qtcreator.pro %{l_shtool} subst \ -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \ @@ -82,11 +82,7 @@ %{l_make} %{l_mflags} install_subtargets INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}" # clean up installation - ( cd $RPM_BUILD_ROOT/%{l_prefix} - mv bin/qtcreator.bin bin/qtcreator - rm bin/qtcreator_process_stub - mv share/pixmaps share/qtcreator - ) || exit $? + rm $RPM_BUILD_ROOT/%{l_prefix}/bin/qtcreator_process_stub # determine internal file listing %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}