Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at Fri Sep 3 15:22:32 CEST 2010. -------- --- KDE/qt-creator/qt-creator.changes 2010-06-21 13:49:25.000000000 +0200 +++ qt-creator/qt-creator.changes 2010-08-30 13:42:39.000000000 +0200 @@ -1,0 +2,13 @@ +Mon Aug 30 10:51:29 UTC 2010 - tittiatcoke@gmail.com + +- update to 2.0.1 + see http://qt.nokia.com/developer/changes/changes-qtcreator-2.0.1 + + +------------------------------------------------------------------- +Mon Aug 30 09:09:30 CEST 2010 - dmueller@suse.de + +- remove botan copy, use system version instead +- fix runpath (bnc#613978) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- qt-creator-1.3.1-src.tar.bz2 robust-gdb-version-parsing.patch New: ---- build-fix.diff hardcoded-runpath.diff qt-creator-2.0.1-src.tar.bz2 system-botan-lib.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.qOsZNl/_old 2010-09-03 15:21:29.000000000 +0200 +++ /var/tmp/diff_new_pack.qOsZNl/_new 2010-09-03 15:21:29.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package qt-creator (Version 1.3.1) +# spec file for package qt-creator (Version 2.0.1) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -24,20 +24,22 @@ Summary: Lightweight IDE BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.qtsoftware.com/developer/qt-creator/ -Version: 1.3.1 -Release: 2 +Version: 2.0.1 +Release: 1 %define rversion %version Source: %name-%rversion-src.tar.bz2 Source1: qtcreator.desktop Source99: %name-rpmlintrc -Patch1: robust-gdb-version-parsing.patch +Patch1: system-botan-lib.diff +Patch2: hardcoded-runpath.diff +Patch3: build-fix.diff ######################################################################################### # SuSE, openSUSE ######################################################################################### %if 0%{?suse_version} BuildRequires: update-desktop-files -BuildRequires: libqt4-devel >= 4.5.80 -#BuildRequires: libqt4-devel-doc +BuildRequires: libbotan-devel >= 1.8.0 +BuildRequires: libqt4-devel >= 4.6.70 BuildRequires: fdupes libQtWebKit-devel Recommends: libqt4-debuginfo %endif @@ -63,6 +65,8 @@ %prep %setup -q -n %name-%rversion-src %patch1 +%patch2 +%patch3 %build %if "%{_lib}"=="lib64" @@ -85,7 +89,7 @@ # copy doc to its (correct) destination: %__install -d -m 755 %{buildroot}%{_docdir}/libqt4/qch/ %__cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_docdir}/libqt4/qch/ -%__rm -rfv $RPM_BUILD_ROOT/share/doc/qtcreator +%__rm -rfv $RPM_BUILD_ROOT/usr/share/doc/qtcreator %if 0%{?suse_version} %suse_update_desktop_file -i qtcreator Development Qt IDE %elseif 0%{?fedora_version} @@ -104,12 +108,9 @@ %files %defattr(-,root,root) %{_bindir}/qtcreator -%{_bindir}/qtcreator.bin %{_bindir}/qtcreator_process_stub -%dir %{_datadir}/doc/qtcreator -%{_datadir}/doc/qtcreator/qtcreator.qch -%{_libdir}/qtcreator -%{_datadir}/qtcreator +%{_libdir}/qtcreator/ +%{_datadir}/qtcreator/ %{_datadir}/pixmaps/qtcreator_logo_*.png %{_datadir}/applications/qtcreator.desktop %dir %{_docdir}/libqt4/qch ++++++ build-fix.diff ++++++ --- src/plugins/help/help.pro 2010-08-24 09:46:08.000000000 +0200 +++ src/plugins/help/help.pro 2010-08-30 14:17:51.093399272 +0200 @@ -1,6 +1,7 @@ TEMPLATE = lib TARGET = Help QT += network +QT += webkit include(../../qtcreatorplugin.pri) include(help_dependencies.pri) ++++++ hardcoded-runpath.diff ++++++ --- src/qtcreatorplugin.pri +++ src/qtcreatorplugin.pri @@ -28,13 +28,7 @@ macx { QMAKE_LFLAGS_SONAME = -Wl,-install_name,@executable_path/../PlugIns/$${PROVIDER}/ } else:linux-* { - #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR - QMAKE_RPATHDIR += \$\$ORIGIN - QMAKE_RPATHDIR += \$\$ORIGIN/.. - QMAKE_RPATHDIR += \$\$ORIGIN/../.. - IDE_PLUGIN_RPATH = $$join(QMAKE_RPATHDIR, ":") - QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\' - QMAKE_RPATHDIR = + QMAKE_RPATHDIR += /usr/$$IDE_LIBRARY_BASENAME/qtcreator } ++++++ qt-creator-1.3.1-src.tar.bz2 -> qt-creator-2.0.1-src.tar.bz2 ++++++ KDE/qt-creator/qt-creator-1.3.1-src.tar.bz2 qt-creator/qt-creator-2.0.1-src.tar.bz2 differ: char 11, line 1 ++++++ system-botan-lib.diff ++++++ --- src/libs/3rdparty/3rdparty.pro +++ src/libs/3rdparty/3rdparty.pro @@ -1,5 +1,4 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS += botan \ - net7ssh +SUBDIRS += net7ssh --- src/libs/3rdparty/net7ssh/src/src.pro +++ src/libs/3rdparty/net7ssh/src/src.pro @@ -6,7 +6,7 @@ include(../../../../qtcreatorlibrary.pri) DEPENDPATH += . -INCLUDEPATH += $$PWD $$PWD/../../botan $$PWD/../../botan/build +INCLUDEPATH += $$PWD /usr/include/botan include(../net7ssh_dependencies.pri) --- src/libs/3rdparty/botan/botan.pri 2010-08-24 09:46:08.000000000 +0200 +++ src/libs/3rdparty/botan/botan.pri 2010-08-30 15:55:34.282698185 +0200 @@ -1,2 +1,2 @@ -INCLUDEPATH *= $$PWD/build -LIBS *= -l$$qtLibraryTarget(Botan) +INCLUDEPATH *= /usr/include +LIBS *= -lbotan ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org