Hello community,

here is the log from the commit of package qt-creator for openSUSE:Factory
checked in at Tue Jun 28 09:37:17 CEST 2011.



--------
--- KDE/qt-creator/qt-creator.changes   2011-05-06 16:59:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/qt-creator/qt-creator.changes  2011-06-24 
12:11:22.000000000 +0200
@@ -1,0 +2,25 @@
+Fri Jun 24 12:10:47 CEST 2011 - [email protected]
+
+- now that the system botan got broken, revert to the intree version that works
+
+-------------------------------------------------------------------
+Thu Jun 23 00:59:42 CEST 2011 - [email protected]
+
+- update to 2.2.1:
+  * Some CDB debugging fixes and a few other small debugging fixes
+  * Fixes to resolving imports in QML and the mobility type descriptions
+  * Translation fixes
+
+-------------------------------------------------------------------
+Sat Jun 18 12:47:48 UTC 2011 - [email protected]
+
+- hardcode the qt version it was built against due to Qt creator's
+  dependency on the private headers of Qt (which break between
+  minor patch releases even)
+
+-------------------------------------------------------------------
+Tue May 17 08:08:51 UTC 2011 - [email protected]
+
+- install qmlpuppet to fix QML Designer
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  libqt-4.7.3-private-headers.tar.bz2
  qt-creator-2.2.0-src.tar.bz2

New:
----
  qt-creator-2.2.1-src.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ qt-creator.spec ++++++
--- /var/tmp/diff_new_pack.cP50vC/_old  2011-06-28 09:36:26.000000000 +0200
+++ /var/tmp/diff_new_pack.cP50vC/_new  2011-06-28 09:36:26.000000000 +0200
@@ -24,27 +24,28 @@
 Summary:        Lightweight IDE
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Url:            http://www.qtsoftware.com/developer/qt-creator/
-Version:        2.2.0
+Version:        2.2.1
 Release:        1
-%define rversion 2.2.0
+%define rversion 2.2.1
 Source:         %name-%rversion-src.tar.bz2
 Source1:        qtcreator.desktop
-Source2:        libqt-4.7.3-private-headers.tar.bz2
 Source99:       %name-rpmlintrc
 Patch1:         system-botan-lib.diff
 Patch2:         hardcoded-runpath.diff
 Patch3:         build-fix.diff
+# depends on private headers and therefore needs the exact Qt version
+%requires_eq    libqt4-x11
 
#########################################################################################
 # SuSE, openSUSE
 
#########################################################################################
 %if 0%{?suse_version}
 BuildRequires:  update-desktop-files
 BuildRequires:  libqt4-devel >= 4.6.70
-BuildRequires:  fdupes libQtWebKit-devel
+BuildRequires:  fdupes libQtWebKit-devel libqt4-private-headers-devel
 Recommends:     libqt4-debuginfo
 Recommends:     libqt4-devel-doc
 %endif
-%if 0%{?suse_version} > 1120
+%if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210
 BuildRequires:  libbotan-devel >= 1.8.0
 %endif
 
#########################################################################################
@@ -61,8 +62,8 @@
 framework even faster and easier.
 
 %prep
-%setup -q -n %name-%rversion-src -a 2
-%if 0%{?suse_version} > 1120
+%setup -q -n %name-%rversion-src
+%if 0%{?suse_version} > 1120 && 0%{?suse_version} < 1210
 %patch1
 %endif
 %patch2
@@ -70,9 +71,9 @@
 
 %build 
 %if "%{_lib}"=="lib64"
-qmake IDE_LIBRARY_BASENAME=lib64 
QT_PRIVATE_HEADERS=`pwd`/libqt-4.7.3-private-headers
+qmake IDE_LIBRARY_BASENAME=lib64
 %else
-qmake QT_PRIVATE_HEADERS=`pwd`/libqt-4.7.3-private-headers
+qmake
 %endif
 make %{?jobs:-j%jobs}
 %if 0
@@ -86,6 +87,7 @@
 # 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}
 # copy doc to its (correct) destination:
 %__install -d -m 755 %{buildroot}%{_docdir}/libqt4/qch/
 %__cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_docdir}/libqt4/qch/
@@ -110,6 +112,7 @@
 %{_bindir}/qtcreator
 %{_bindir}/qtcreator_process_stub
 %{_bindir}/qtpromaker
+%{_bindir}/qmlpuppet
 %{_libdir}/qtcreator/
 %{_datadir}/qtcreator/
 %{_datadir}/pixmaps/qtcreator_logo_*.png

++++++ qt-creator-2.2.0-src.tar.bz2 -> qt-creator-2.2.1-src.tar.bz2 ++++++
KDE/qt-creator/qt-creator-2.2.0-src.tar.bz2 
/mounts/work_src_done/STABLE/qt-creator/qt-creator-2.2.1-src.tar.bz2 differ: 
char 11, line 1


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to