diff -r 2a1b1cf8080a -r 4f973c756446 qtcreator/qtcreator.spec --- a/qtcreator/qtcreator.spec Sun Oct 10 18:21:45 2010 +0200 +++ b/qtcreator/qtcreator.spec Fri Oct 15 18:46:25 2010 +0200 @@ -1,6 +1,6 @@ ## ## qtcreator.spec -- OpenPKG RPM Specification -## Copyright (c) 2009 Michael Schloh von Bennewitz +## Copyright (c) 2010 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 @@ -32,7 +32,7 @@ Group: Development License: GPL Version: 2.0.1 -Release: 20101010 +Release: 20101012 # list of sources Source0: ftp://ftp.qt.nokia.com/qtcreator/qt-creator-%{version}-src.tgz @@ -56,20 +56,25 @@ %track prog qtcreator = { version = %{version} - url = ftp://ftp.trolltech.com/qtcreator/ - regex = qt-creator-(__VER__)-src\.tar\.gz + url = ftp://ftp.qt.nokia.com/qtcreator/ + regex = qt-creator-(__VER__)-src\.tgz } %prep %setup -q -n qt-creator-%{version}-src %{l_shtool} subst \ - -e 's;\(CONFIG[\ \t]*+=\)[\ \t]*\(.*\);\1 static \2;' \ - qtcreator.pro + -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \ + -e 's;\(\$\$join(QMAKE_RPATHDIR, ":"\));\1, "%{l_prefix}/lib/qtcreator:");' \ + src/rpath.pri %{l_shtool} subst \ - -e 's;\(QMAKE_RPATHDIR +=\);#\1;g' \ - -e 's;\(QMAKE_RPATHDIR =\)$;\1 %{l_prefix}/lib/qtcreator:%{l_prefix}/lib/qt/dynamic;' \ - src/qtcreatorplugin.pri \ - src/rpath.pri + -e 's;\(share\)/\(doc\)/\(qtcreator\);\1/\3/\2;' \ + doc/doc.pri \ + qtcreator.pri \ + src/plugins/help/helpplugin.cpp + echo '' >>src/libs/3rdparty/botan/botan.pro + for profil in `find . -name '*.pro' | grep -v '[ ]'`; do + echo 'CONFIG += shared' >>$profil + done %build %{l_prefix}/bin/qmake qtcreator.pro @@ -79,7 +84,7 @@ rm -rf $RPM_BUILD_ROOT # carry out installation procedure - %{l_make} %{l_mflags} install_subtargets INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}" + %{l_make} %{l_mflags} install INSTALL_ROOT="$RPM_BUILD_ROOT%{l_prefix}" # clean up installation rm $RPM_BUILD_ROOT/%{l_prefix}/bin/qtcreator_process_stub