Hello community, here is the log from the commit of package qt-creator for openSUSE:Factory checked in at 2012-05-16 15:04:16 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt-creator (Old) and /work/SRC/openSUSE:Factory/.qt-creator.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt-creator", Maintainer is "dmuel...@suse.com" Changes: -------- --- /work/SRC/openSUSE:Factory/qt-creator/qt-creator.changes 2012-03-26 11:05:50.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.qt-creator.new/qt-creator.changes 2012-05-16 15:04:19.000000000 +0200 @@ -1,0 +2,9 @@ +Sun May 13 17:12:11 UTC 2012 - cgiboude...@gmx.com + +- Update to 2.5.0 + See http://qt.gitorious.org/qt-creator/qt-creator/blobs/2.5/dist/changes-2.5.0 + for the complete changelog + +- Spec cleanup + +------------------------------------------------------------------- Old: ---- build-fix.diff qt-creator-2.4.1-src.tar.bz2 qt-creator-gcc47.patch New: ---- qt-creator-2.5.0-src.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt-creator.spec ++++++ --- /var/tmp/diff_new_pack.RgMhbc/_old 2012-05-16 15:04:22.000000000 +0200 +++ /var/tmp/diff_new_pack.RgMhbc/_new 2012-05-16 15:04:22.000000000 +0200 @@ -17,20 +17,18 @@ Name: qt-creator +Version: 2.5.0 +Release: 0 Summary: Lightweight IDE License: LGPL-2.1 ; LGPL-2.1+ ; MIT Group: Development/Tools/IDE -BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.qtsoftware.com/developer/qt-creator/ -Version: 2.4.1 -Release: 0 -%define rversion 2.4.1 -Source: %name-%rversion-src.tar.bz2 +%define rversion 2.5.0 +Source: http://get.qt.nokia.com/qtcreator/%{name}-%{rversion}-src.tar.gz Source1: qtcreator.desktop Patch1: system-botan-lib.diff Patch2: hardcoded-runpath.diff -Patch3: build-fix.diff -Patch4: qt-creator-gcc47.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-build # depends on private headers and therefore needs the exact Qt version %requires_eq libqt4-x11 ######################################################################################### @@ -42,9 +40,9 @@ BuildRequires: libqt4-devel >= 4.7.4 BuildRequires: libqt4-private-headers-devel BuildRequires: update-desktop-files +Recommends: libQtWebKit-devel Recommends: libqt4-debuginfo Recommends: libqt4-devel-doc -Recommends: libQtWebKit-devel %endif %if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210 BuildRequires: libbotan-devel >= 1.8.0 @@ -56,7 +54,7 @@ BuildRequires: desktop-file-utils BuildRequires: qt4-devel >= 4.7.4 %endif -Provides: %name-devel = %version +Provides: %{name}-devel = %{version} %description Qt Creator is a new, lightweight, cross-platform integrated development @@ -64,13 +62,11 @@ framework even faster and easier. %prep -%setup -q -n %name-%rversion-src +%setup -q -n %{name}-%rversion-src %if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210 %patch1 %endif %patch2 -%patch3 -%patch4 -p1 %build %if "%{_lib}"=="lib64" @@ -78,8 +74,8 @@ %else qmake %endif -make %{?jobs:-j%jobs} -make %{?jobs:-j%jobs} docs +make %{?_smp_mflags} +make %{?_smp_mflags} docs %if 0 cd share/qtcreator/gdbmacros qmake @@ -89,22 +85,22 @@ %install export QTDIR=/usr/share/qt4 # its qmake. of course it is broken -make INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix} install -%__install -m 755 bin/qtcreator %{buildroot}%{_bindir} -%__install -m 755 bin/qmlpuppet %{buildroot}%{_bindir} +make INSTALL_ROOT=%{buildroot}/%{_prefix} install +install -m 755 bin/qtcreator %{buildroot}%{_bindir} +install -m 755 bin/qmlpuppet %{buildroot}%{_bindir} # 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/usr/share/doc/qtcreator +install -d -m 755 %{buildroot}%{_docdir}/libqt4/qch/ +cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_docdir}/libqt4/qch/ +rm -rfv %{buildroot}%{_datadir}/doc/qtcreator %if 0%{?suse_version} %suse_update_desktop_file -i qtcreator Development Qt IDE %elseif 0%{?fedora_version} desktop-file-install --dir=%{buildroot}%{_datadir}/applications/ --add-category Development --add-category Qt --add-category IDE qtcreator.desktop %endif -%fdupes $RPM_BUILD_ROOT +%fdupes %{buildroot} %if 0 cd share/qtcreator/gdbmacros -make INSTALL_ROOT=$RPM_BUILD_ROOT/%{_prefix} install +make INSTALL_ROOT=%{buildroot}/%{_prefix} install %endif %post -p /sbin/ldconfig @@ -114,19 +110,19 @@ %files %defattr(-,root,root) %doc LICENSE.LGPL LGPL_EXCEPTION.TXT README -%{_bindir}/qtcreator -%{_bindir}/qtcreator_process_stub -%{_bindir}/qtpromaker -%{_bindir}/qmlprofiler -%{_bindir}/qmlpuppet -%{_libdir}/qtcreator/ -%{_datadir}/qtcreator/ -%{_datadir}/applications/qtcreator.desktop %dir %{_datadir}/icons/hicolor %dir %{_datadir}/icons/hicolor/* %dir %{_datadir}/icons/hicolor/*/apps -%{_datadir}/icons/hicolor/*/apps/qtcreator.png %dir %{_docdir}/libqt4/qch %doc %{_docdir}/libqt4/qch/qtcreator.qch +%{_bindir}/qmlprofiler +%{_bindir}/qmlpuppet +%{_bindir}/qtcreator +%{_bindir}/qtcreator_process_stub +%{_bindir}/qtpromaker +%{_datadir}/applications/qtcreator.desktop +%{_datadir}/icons/hicolor/*/apps/qtcreator.png +%{_datadir}/qtcreator/ +%{_libdir}/qtcreator/ %changelog ++++++ system-botan-lib.diff ++++++ --- /var/tmp/diff_new_pack.RgMhbc/_old 2012-05-16 15:04:22.000000000 +0200 +++ /var/tmp/diff_new_pack.RgMhbc/_new 2012-05-16 15:04:22.000000000 +0200 @@ -1,17 +1,17 @@ ---- src/libs/3rdparty/botan/botan.pri.orig 2011-11-20 11:51:18.432411353 +0100 -+++ src/libs/3rdparty/botan/botan.pri 2011-11-20 11:52:00.336884542 +0100 +--- src/libs/3rdparty/botan/botan.pri 2012-05-09 14:13:19.000000000 +0200 ++++ src/libs/3rdparty/botan/botan.pri 2012-05-13 19:53:16.599828913 +0200 @@ -1,2 +1,2 @@ -INCLUDEPATH *= $$PWD/build -LIBS *= -l$$qtLibraryName(Botan) +INCLUDEPATH *= /usr/include +LIBS *= -lbotan ---- src/libs/libs.pro.orig 2011-11-20 11:52:48.293281649 +0100 -+++ src/libs/libs.pro 2011-11-20 11:53:01.033121486 +0100 +--- src/libs/libs.pro 2012-05-09 14:13:19.000000000 +0200 ++++ src/libs/libs.pro 2012-05-13 19:53:45.854461132 +0200 @@ -5,7 +5,6 @@ # aggregation and extensionsystem are directly in src.pro # because of dependencies of app SUBDIRS = \ - 3rdparty \ - qtconcurrent \ utils \ utils/process_stub.pro \ + languageutils \ -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
