Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Feb 18 17:28:06 CET 2010. -------- --- libqt4/libqt4-devel-doc-data.changes 2010-02-04 11:18:05.000000000 +0100 +++ libqt4/libqt4-devel-doc-data.changes 2010-02-17 17:17:53.000000000 +0100 @@ -1,0 +2,13 @@ +Wed Feb 17 17:15:06 CET 2010 - dmueller@suse.de + +- update to 4.6.2: + * forward and backward compatible bugfix update with a long + list of fixes, see included changes-4.6.2 + +------------------------------------------------------------------- +Sat Feb 13 22:08:13 UTC 2010 - jengelh@medozas.de + +- SPARC configuration support +- use %_smp_mflags + +------------------------------------------------------------------- libqt4-devel-doc.changes: same change libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: ---- qsslcertificate-subjectinfo-fix.diff qt-everywhere-opensource-src-4.6.1.tar.bz2 New: ---- fix-sequence-error.diff qt-everywhere-opensource-src-4.6.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.6.1) +# spec file for package libqt4-devel-doc-data (Version 4.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,11 +27,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.1 -Release: 3 +Version: 4.6.2 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.1 +%define rversion 4.6.2 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -72,9 +72,9 @@ Patch107: webkit-ia64_s390x.patch Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff -Patch111: qsslcertificate-subjectinfo-fix.diff Patch112: s390-qatomic-fixes.diff Patch113: ppc64-webkit-link-fix.diff +Patch114: fix-sequence-error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -123,9 +123,9 @@ %patch107 %patch108 %patch109 -%patch111 -p1 %patch112 %patch113 +%patch114 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -141,18 +141,24 @@ %else OPTIONS="" %endif -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake demos -xmlpatterns -webkit +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform $OPTIONS \ + -plugin-sql-sqlite -nomake demos -xmlpatterns -webkit %check_config %if 0 pushd src -make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic +make %{?_smp_mflags} sub-moc sub-rcc sub-uic popd pushd tools -make %{?jobs:-j%jobs} sub-assistant +make %{?_smp_mflags} sub-assistant popd pushd tools/qdoc3 -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd %else # simply use the binaries from the -devel package instead of building it again rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ @@ -163,9 +169,9 @@ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -make %{?jobs:-j%jobs} sub-tools-bootstrap +make %{?_smp_mflags} sub-tools-bootstrap %endif -test -d doc/qch || make %{?jobs:-j%jobs} docs +test -d doc/qch || make %{?_smp_mflags} docs ./config.status %install ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc (Version 4.6.1) +# spec file for package libqt4-devel-doc (Version 4.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -30,11 +30,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.1 -Release: 3 +Version: 4.6.2 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.1 +%define rversion 4.6.2 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -79,9 +79,9 @@ Patch107: webkit-ia64_s390x.patch Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff -Patch111: qsslcertificate-subjectinfo-fix.diff Patch112: s390-qatomic-fixes.diff Patch113: ppc64-webkit-link-fix.diff +Patch114: fix-sequence-error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -130,9 +130,9 @@ %patch107 %patch108 %patch109 -%patch111 -p1 %patch112 %patch113 +%patch114 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -165,11 +165,17 @@ export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform \ + -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config %if 0 -make %{?jobs:-j%jobs} sub-src +make %{?_smp_mflags} sub-src %else # simply use the binaries from the -devel package instead of building it again rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) @@ -180,9 +186,9 @@ rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) %endif -make %{?jobs:-j%jobs} -C tools/assistant -make %{?jobs:-j%jobs} -C demos -make %{?jobs:-j%jobs} -C examples +make %{?_smp_mflags} -C tools/assistant +make %{?_smp_mflags} -C demos +make %{?_smp_mflags} -C examples %install export QTDIR=$PWD ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.6.1) +# spec file for package libqt4-sql-plugins (Version 4.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -28,11 +28,11 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.6.1 -Release: 3 +Version: 4.6.2 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.1 +%define rversion 4.6.2 # COMMON-VERSION-END # COMMON-VERSION-END Url: http://www.trolltech.com @@ -71,9 +71,9 @@ Patch107: webkit-ia64_s390x.patch Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff -Patch111: qsslcertificate-subjectinfo-fix.diff Patch112: s390-qatomic-fixes.diff Patch113: ppc64-webkit-link-fix.diff +Patch114: fix-sequence-error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -122,9 +122,9 @@ %patch107 %patch108 %patch109 -%patch111 -p1 %patch112 %patch113 +%patch114 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -193,20 +193,26 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options -no-webkit -no-xmlpatterns -nomake examples \ +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform \ + -no-webkit -no-xmlpatterns -nomake examples \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ -plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2 %if 0 -make %{?jobs:-j%jobs} sub-src +make %{?_smp_mflags} sub-src %else rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -make %{?jobs:-j%jobs} -C src/sql -make %{?jobs:-j%jobs} -C src/plugins/sqldrivers +make %{?_smp_mflags} -C src/sql +make %{?_smp_mflags} -C src/plugins/sqldrivers %endif %install ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.6.1) +# spec file for package libqt4 (Version 4.6.2) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -53,11 +53,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.6.1 -Release: 3 +Version: 4.6.2 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- -%define rversion 4.6.1 +%define rversion 4.6.2 # COMMON-VERSION-END # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -89,9 +89,9 @@ Patch107: webkit-ia64_s390x.patch Patch108: minimal-toc-for-webkit.diff Patch109: libqt4-libtool-nodate.diff -Patch111: qsslcertificate-subjectinfo-fix.diff Patch112: s390-qatomic-fixes.diff Patch113: ppc64-webkit-link-fix.diff +Patch114: fix-sequence-error.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -fast -no-separate-debug-info -shared -xkb -xrender -xcursor -dbus-linked -xfixes -xrandr -xinerama -sm -no-nas-sound -no-rpath -system-libjpeg -system-libpng -accessibility -cups -stl -nis -system-zlib -qt-gif -prefix /usr -L %_libdir -libdir %_libdir -docdir %_docdir/%{base_name} -examplesdir %_libdir/qt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -reduce-relocations -exceptions -system-libtiff -glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite -qt3support -no-sql-mysql -xsync -xinput -gtkstyle %define check_config \ @@ -140,9 +140,9 @@ %patch107 %patch108 %patch109 -%patch111 -p1 %patch112 %patch113 +%patch114 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -434,7 +434,13 @@ export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" export MAKEFLAGS="%{?jobs:-j %jobs}" touch translations/qt_de.qm -echo yes | ./configure %common_options -plugin-sql-sqlite -nomake examples -nomake demos -webkit -xmlpatterns +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform \ + -plugin-sql-sqlite -nomake examples -nomake demos -webkit -xmlpatterns %check_config test -s translations/qt_de.qm || rm translations/qt_de.qm make %{?jobs:-j %jobs} ++++++ fix-sequence-error.diff ++++++ --- src/gui/kernel//qsoftkeymanager.cpp +++ src/gui/kernel/qsoftkeymanager.cpp @@ -215,7 +215,7 @@ if (source) { bool added = appendSoftkeys(*source, level); source = softkeySource(source, recursiveMerging); - level = added ? ++level : level; + level = added ? level + 1 : level; } } while (source); ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -46,18 +46,24 @@ %else OPTIONS="" %endif -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options $OPTIONS -plugin-sql-sqlite -nomake demos -xmlpatterns -webkit +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform $OPTIONS \ + -plugin-sql-sqlite -nomake demos -xmlpatterns -webkit %check_config %if 0 pushd src -make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic +make %{?_smp_mflags} sub-moc sub-rcc sub-uic popd pushd tools -make %{?jobs:-j%jobs} sub-assistant +make %{?_smp_mflags} sub-assistant popd pushd tools/qdoc3 -make %{?jobs:-j%jobs} +make %{?_smp_mflags} popd %else # simply use the binaries from the -devel package instead of building it again rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ @@ -68,9 +74,9 @@ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -make %{?jobs:-j%jobs} sub-tools-bootstrap +make %{?_smp_mflags} sub-tools-bootstrap %endif -test -d doc/qch || make %{?jobs:-j%jobs} docs +test -d doc/qch || make %{?_smp_mflags} docs ./config.status %install ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -70,11 +70,17 @@ export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform \ + -webkit -xmlpatterns -no-sql-sqlite -no-sql-sqlite2 -no-sql-mysql %check_config %if 0 -make %{?jobs:-j%jobs} sub-src +make %{?_smp_mflags} sub-src %else # simply use the binaries from the -devel package instead of building it again rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) @@ -85,9 +91,9 @@ rpm -ql libQtWebKit-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) %endif -make %{?jobs:-j%jobs} -C tools/assistant -make %{?jobs:-j%jobs} -C demos -make %{?jobs:-j%jobs} -C examples +make %{?_smp_mflags} -C tools/assistant +make %{?_smp_mflags} -C demos +make %{?_smp_mflags} -C examples %install export QTDIR=$PWD ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.2Xgi2c/_old 2010-02-18 17:26:52.000000000 +0100 +++ /var/tmp/diff_new_pack.2Xgi2c/_new 2010-02-18 17:26:52.000000000 +0100 @@ -98,20 +98,26 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf -export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options -no-webkit -no-xmlpatterns -nomake examples \ +export MAKEFLAGS="%{?_smp_mflags}" +%ifarch sparc64 +platform="-platform linux-g++-64" +%else +platform="" +%endif +echo yes | ./configure %common_options $platform \ + -no-webkit -no-xmlpatterns -nomake examples \ -plugin-sql-psql -I/usr/include -I/usr/include/pgsql/ -I/usr/include/pgsql/server \ -plugin-sql-odbc \ -plugin-sql-mysql -I/usr/include/mysql/ -no-sql-sqlite -no-sql-sqlite2 %if 0 -make %{?jobs:-j%jobs} sub-src +make %{?_smp_mflags} sub-src %else rpm -ql libqt4-devel | grep %{_bindir}/ | sed 's#%{_bindir}/##' | \ ( while read file; do test -e bin/$file || ln -s %{_bindir}/$file bin/ ; done ) rpm -ql libqt4-devel | grep %{_libdir}/lib | sed 's#%{_libdir}/##' | \ ( while read file; do test -e lib/$file || ln -s %{_libdir}/$file lib/ ; done ) -make %{?jobs:-j%jobs} -C src/sql -make %{?jobs:-j%jobs} -C src/plugins/sqldrivers +make %{?_smp_mflags} -C src/sql +make %{?_smp_mflags} -C src/plugins/sqldrivers %endif %install ++++++ qt-everywhere-opensource-src-4.6.1.tar.bz2 -> qt-everywhere-opensource-src-4.6.2.tar.bz2 ++++++ libqt4/qt-everywhere-opensource-src-4.6.1.tar.bz2 libqt4/qt-everywhere-opensource-src-4.6.2.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org