Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at 2012-02-28 19:24:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt4 (Old) and /work/SRC/openSUSE:Factory/.libqt4.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt4", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libqt4/libqt4-devel-doc.changes 2012-01-11 15:38:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqt4.new/libqt4-devel-doc.changes 2012-02-28 19:24:29.000000000 +0100 @@ -1,0 +2,5 @@ +Mon Feb 27 10:52:07 CET 2012 - [email protected] + +- fix update conflict with libqt4-devel-doc (bnc#746098) + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:37.000000000 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:37.000000000 +0100 @@ -266,6 +266,12 @@ %suse_update_desktop_file -i assistant4 Qt Development Documentation +%pre +# used to be a directory, is now a binary +if [ $1 -gt 1 -a -d %_libdir/qt4/examples/declarative/i18n/i18n ]; then + rm -rf %_libdir/qt4/examples/declarative/i18n/i18n || true +fi + %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:37.000000000 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:37.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libqt4 BuildRequires: Mesa-devel BuildRequires: alsa-devel @@ -60,8 +61,8 @@ Conflicts: %{name}-x11 <= 4.5.1-2.5 # Obsoletes: qt < 4.4.0 -Provides: qt = 4.4.0 Provides: libqt4-dbus-1 = 4.4.0 +Provides: qt = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.8.0 @@ -171,27 +172,37 @@ Summary: Qt Development Kit License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 Group: Development/Libraries/X11 -Requires: zlib-devel c++_compiler pkgconfig -Requires: freetype2-devel libmng-devel libpng-devel libtiff-devel -Requires: xorg-x11-devel Mesa-devel dbus-1-devel openssl-devel -Requires: glib2-devel sqlite3-devel make Requires: %name = %version +Requires: Mesa-devel +Requires: c++_compiler +Requires: dbus-1-devel +Requires: freetype2-devel +Requires: glib2-devel +Requires: libmng-devel +Requires: libpng-devel Requires: libqt4-sql-sqlite >= %version +Requires: libtiff-devel +Requires: make +Requires: openssl-devel +Requires: pkgconfig +Requires: sqlite3-devel +Requires: xorg-x11-devel +Requires: zlib-devel # bug437293 %ifarch ppc64 Obsoletes: qt-devel-64bit %endif # -Provides: dbus-1-qt-devel = 0.63 -Provides: qt-devel = 4.4.0 Provides: dbus-1-qt = 0.63 -Provides: qt-dbus-1 = 4.2.0 +Provides: dbus-1-qt-devel = 0.63 Provides: libQtDeclarative-devel = 4.6.0 +Provides: qt-dbus-1 = 4.2.0 +Provides: qt-devel = 4.4.0 Obsoletes: dbus-1-qt < 0.63 -Obsoletes: qt-dbus-1 < 4.2.0 Obsoletes: dbus-1-qt-devel < 0.63 -Obsoletes: qt-devel < 4.4.0 Obsoletes: libQtDeclarative-devel < 4.6.0 +Obsoletes: qt-dbus-1 < 4.2.0 +Obsoletes: qt-devel < 4.4.0 %description devel You need this package, if you want to compile programs with Qt. It @@ -315,7 +326,8 @@ Summary: Non-ABI stabile experimental API License: GPL-3.0 or SUSE-LGPL-2.1-with-nokia-exception-1.1 Group: Development/Libraries/C and C++ -Requires: libqt4-x11 = %version libqt4-devel = %version +Requires: libqt4-devel = %version +Requires: libqt4-x11 = %version %description private-headers-devel This package provides private headers of libqt4-devel that are normally @@ -329,8 +341,8 @@ Summary: Phonon Multimedia Platform Abstraction License: LGPL-2.0+ Group: Development/Libraries/KDE -Requires: phonon-backend = %version Requires: libphonon4 = %version +Requires: phonon-backend = %version %description -n phonon Phonon is a cross-platform portable Multimedia Support Abstraction, ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.yAdf2r/_old 2012-02-28 19:24:38.000000000 +0100 +++ /var/tmp/diff_new_pack.yAdf2r/_new 2012-02-28 19:24:38.000000000 +0100 @@ -163,6 +163,12 @@ %suse_update_desktop_file -i assistant4 Qt Development Documentation +%pre +# used to be a directory, is now a binary +if [ $1 -gt 1 -a -d %_libdir/qt4/examples/declarative/i18n/i18n ]; then + rm -rf %_libdir/qt4/examples/declarative/i18n/i18n || true +fi + %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
