Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon May 30 16:34:53 CEST 2011. -------- --- libqt4/libqt4-devel-doc.changes 2011-05-17 12:44:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-05-30 15:01:44.000000000 +0200 @@ -1,0 +2,15 @@ +Mon May 30 15:01:28 CEST 2011 - dmueller@suse.de + +- fix buildrequires on subspecfiles + +------------------------------------------------------------------- +Sat May 28 14:15:16 UTC 2011 - idonmez@novell.com + +- Use diff -u instead of cmp in check_config + +------------------------------------------------------------------- +Fri May 20 22:51:37 CEST 2011 - dmueller@suse.de + +-fix build for older distros + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: ---- libqt4-devel-doc-data.spec.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.000000000 +0200 @@ -21,7 +21,7 @@ Name: libqt4-devel-doc BuildRequires: Mesa-devel cups-devel freeglut-devel libjpeg-devel libpng-devel -BuildRequires: alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel +BuildRequires: alsa-devel gtk2-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -31,12 +31,13 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML @@ -92,7 +93,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ - cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ + diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ fi \ %description @@ -161,7 +162,9 @@ %package data License: QPL, GPL Group: System/Libraries +%if %suse_version > 1110 BuildArch: noarch +%endif Summary: C++ Program Library, Core Components Requires: %name = %version ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.000000000 +0200 @@ -22,19 +22,20 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel BuildRequires: libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel -BuildRequires: Mesa-devel alsa-devel gtk2-devel libqt4-devel +BuildRequires: Mesa-devel alsa-devel gtk2-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version # COMMON-VERSION-END # COMMON-VERSION-END +BuildRequires: libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: System/Libraries @@ -84,7 +85,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ - cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ + diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ fi \ %description ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 1 +Release: 2 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -102,7 +102,7 @@ %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ if test -f /usr/share/qt4/mkspecs/qconfig.pri ; then \ - cmp /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ + diff -u /usr/share/qt4/mkspecs/qconfig.pri mkspecs/qconfig.pri || exit 1; \ fi \ %description ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.000000000 +0200 @@ -20,7 +20,7 @@ Name: libqt4-devel-doc BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel Mesa-devel -BuildRequires: alsa-devel gtk2-devel libQtWebKit-devel libqt4-devel sqlite3-devel +BuildRequires: alsa-devel gtk2-devel sqlite3-devel %if 0%{?suse_version} > 1020 BuildRequires: fdupes %endif @@ -29,6 +29,7 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END +BuildRequires: libQtWebKit-devel >= %version libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: Documentation/HTML @@ -58,7 +59,9 @@ %package data License: QPL, GPL Group: System/Libraries +%if %suse_version > 1110 BuildArch: noarch +%endif Summary: C++ Program Library, Core Components Requires: %name = %version ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.HsUmPj/_old 2011-05-30 16:31:28.000000000 +0200 +++ /var/tmp/diff_new_pack.HsUmPj/_new 2011-05-30 16:31:28.000000000 +0200 @@ -21,12 +21,13 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel BuildRequires: libmysqlclient-devel pkgconfig postgresql-devel unixODBC-devel -BuildRequires: alsa-devel gtk2-devel libqt4-devel Mesa-devel +BuildRequires: alsa-devel gtk2-devel Mesa-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-END +BuildRequires: libqt4-devel >= %version Url: http://www.trolltech.com License: QPL, GPL Group: System/Libraries ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org