1.1 --- a/qtcreator/qtcreator.spec Sun Oct 10 18:19:47 2010 +0200 1.2 +++ b/qtcreator/qtcreator.spec Sun Oct 10 18:21:45 2010 +0200 1.3 @@ -31,17 +31,17 @@ 1.4 Class: EVAL 1.5 Group: Development 1.6 License: GPL 1.7 -Version: 1.2.90 1.8 -Release: 20091014 1.9 +Version: 2.0.1 1.10 +Release: 20101010 1.11 1.12 # list of sources 1.13 -Source0: ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tar.gz 1.14 +Source0: ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tgz 1.15 1.16 # build information 1.17 Prefix: %{l_prefix} 1.18 BuildRoot: %{l_buildroot} 1.19 -BuildPreReq: OpenPKG, openpkg >= 20050726, qt, gcc 1.20 -PreReq: OpenPKG, openpkg >= 20050726, qt 1.21 +BuildPreReq: OpenPKG, openpkg >= 20050726, QTSDK, gcc 1.22 +PreReq: OpenPKG, openpkg >= 20050726, QTSDK 1.23 AutoReq: no 1.24 AutoReqProv: no 1.25 1.26 @@ -63,7 +63,7 @@ 1.27 %prep 1.28 %setup -q -n qt-creator-%{version}-src 1.29 %{l_shtool} subst \ 1.30 - -e 's;\(CONFIG[\ \t]*+=\)\(.*\);\1 static\2;' \ 1.31 + -e 's;\(CONFIG[\ \t]*+=\)[\ \t]*\(.*\);\1 static \2;' \ 1.32 qtcreator.pro 1.33 %{l_shtool} subst \ 1.34 -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \ 1.35 @@ -82,11 +82,7 @@ 1.36 %{l_make} %{l_mflags} install_subtargets INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}" 1.37 1.38 # clean up installation 1.39 - ( cd $RPM_BUILD_ROOT/%{l_prefix} 1.40 - mv bin/qtcreator.bin bin/qtcreator 1.41 - rm bin/qtcreator_process_stub 1.42 - mv share/pixmaps share/qtcreator 1.43 - ) || exit $? 1.44 + rm $RPM_BUILD_ROOT/%{l_prefix}/bin/qtcreator_process_stub 1.45 1.46 # determine internal file listing 1.47 %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}