Hello community, here is the log from the commit of package libqt4 checked in at Mon Apr 21 18:39:44 CEST 2008. -------- --- libqt4/libqt4.changes 2008-04-14 20:30:08.000000000 +0200 +++ libqt4/libqt4.changes 2008-04-21 11:39:13.000000000 +0200 @@ -1,0 +2,8 @@ +Mon Apr 21 11:38:44 CEST 2008 - dmueller@suse.de + +- update to 20080419 of release branch: + * some patches were upstreamed +- try a different workaround for postgresql-devel requirements + being incorrect + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change Old: ---- 0220-no-x-recursion-in-xerrhandler.diff compile-qsslsocket.diff prefer-linked-opengl.diff New: ---- revert-psql-detection.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.V26486/_old 2008-04-21 18:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.V26486/_new 2008-04-21 18:38:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080413) +# spec file for package libqt4-devel-doc-data (Version 4.3.95+20080419) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -27,8 +27,8 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080413 -Release: 3 +Version: 4.3.95+20080419 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.0-rc1 @@ -55,14 +55,12 @@ Patch53: allow-shlib-undefined.diff Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff -Patch56: compile-qsslsocket.diff -Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch63: 0220-no-x-recursion-in-xerrhandler.diff Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff +Patch67: revert-psql-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -100,19 +98,15 @@ %patch53 %patch54 %patch55 -%patch58 %patch60 %if %suse_version > 910 # bnc#374073 comment #8 # %patch61 %endif %patch62 -%patch63 -pushd src %patch65 -popd %patch66 -#%patch56 +%patch67 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -171,6 +165,11 @@ /usr/share/doc/packages/%base_name/src %changelog +* Mon Apr 21 2008 dmueller@suse.de +- update to 20080419 of release branch: + * some patches were upstreamed +- try a different workaround for postgresql-devel requirements + being incorrect * Mon Apr 14 2008 stbinner@suse.de - fix build * Mon Apr 14 2008 dmueller@suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.V26486/_old 2008-04-21 18:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.V26486/_new 2008-04-21 18:38:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.3.95+20080413) +# spec file for package libqt4 (Version 4.3.95+20080419) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -33,8 +33,8 @@ Provides: libqt4-dbus-1 <= 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.3.95+20080413 -Release: 3 +Version: 4.3.95+20080419 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.0-rc1 @@ -61,14 +61,12 @@ Patch53: allow-shlib-undefined.diff Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff -Patch56: compile-qsslsocket.diff -Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch63: 0220-no-x-recursion-in-xerrhandler.diff Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff +Patch67: revert-psql-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -107,19 +105,15 @@ %patch53 %patch54 %patch55 -%patch58 %patch60 %if %suse_version > 910 # bnc#374073 comment #8 # %patch61 %endif %patch62 -%patch63 -pushd src %patch65 -popd %patch66 -#%patch56 +%patch67 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -413,6 +407,11 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Mon Apr 21 2008 dmueller@suse.de +- update to 20080419 of release branch: + * some patches were upstreamed +- try a different workaround for postgresql-devel requirements + being incorrect * Mon Apr 14 2008 stbinner@suse.de - fix build * Mon Apr 14 2008 dmueller@suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.V26486/_old 2008-04-21 18:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.V26486/_new 2008-04-21 18:38:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.3.95+20080413) +# spec file for package libqt4-sql-plugins (Version 4.3.95+20080419) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -15,13 +15,6 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel freeglut-devel libjpeg-devel libmysqlclient-devel libpng-devel BuildRequires: pkgconfig postgresql-devel unixODBC-devel -# bug 361431 - still not fixed :( -%if 1 -BuildRequires: libxslt-devel openssl-devel pam-devel readline-devel -%if %suse_version > 910 -BuildRequires: krb5-devel -%endif -%endif BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -33,8 +26,8 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080413 -Release: 3 +Version: 4.3.95+20080419 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.0-rc1 @@ -61,14 +54,12 @@ Patch53: allow-shlib-undefined.diff Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff -Patch56: compile-qsslsocket.diff -Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch63: 0220-no-x-recursion-in-xerrhandler.diff Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff +Patch67: revert-psql-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -105,19 +96,15 @@ %patch53 %patch54 %patch55 -%patch58 %patch60 %if %suse_version > 910 # bnc#374073 comment #8 # %patch61 %endif %patch62 -%patch63 -pushd src %patch65 -popd %patch66 -#%patch56 +%patch67 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -236,6 +223,11 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Mon Apr 21 2008 dmueller@suse.de +- update to 20080419 of release branch: + * some patches were upstreamed +- try a different workaround for postgresql-devel requirements + being incorrect * Mon Apr 14 2008 stbinner@suse.de - fix build * Mon Apr 14 2008 dmueller@suse.de ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.V26486/_old 2008-04-21 18:38:33.000000000 +0200 +++ /var/tmp/diff_new_pack.V26486/_new 2008-04-21 18:38:33.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.3.95+20080413) +# spec file for package libQtWebKit-devel (Version 4.3.95+20080419) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -30,8 +30,8 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.3.95+20080413 -Release: 3 +Version: 4.3.95+20080419 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- %define rversion 4.4.0-rc1 @@ -58,14 +58,12 @@ Patch53: allow-shlib-undefined.diff Patch54: qatomic-no-barrier.diff Patch55: ignore-global-advance-width-in-fots.diff -Patch56: compile-qsslsocket.diff -Patch58: prefer-linked-opengl.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch63: 0220-no-x-recursion-in-xerrhandler.diff Patch65: qt-4.4-update.diff Patch66: statusbar-recursion.diff +Patch67: revert-psql-detection.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 -no-exceptions -system-libtiff -no-glib -optimized-qmake -no-webkit -no-xmlpatterns -system-sqlite @@ -104,19 +102,15 @@ %patch53 %patch54 %patch55 -%patch58 %patch60 %if %suse_version > 910 # bnc#374073 comment #8 # %patch61 %endif %patch62 -%patch63 -pushd src %patch65 -popd %patch66 -#%patch56 +%patch67 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -282,6 +276,11 @@ /usr/bin/svgviewer %changelog +* Mon Apr 21 2008 dmueller@suse.de +- update to 20080419 of release branch: + * some patches were upstreamed +- try a different workaround for postgresql-devel requirements + being incorrect * Mon Apr 14 2008 stbinner@suse.de - fix build * Mon Apr 14 2008 dmueller@suse.de ++++++ libqt4-sql-plugins.spec.in ++++++ --- libqt4/libqt4-sql-plugins.spec.in 2008-04-13 14:31:05.000000000 +0200 +++ libqt4/libqt4-sql-plugins.spec.in 2008-04-18 01:37:24.000000000 +0200 @@ -14,13 +14,6 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel libmysqlclient-devel BuildRequires: pkgconfig postgresql-devel unixODBC-devel -# bug 361431 - still not fixed :( -%if 1 -BuildRequires: pam-devel openssl-devel readline-devel libxslt-devel -%if %suse_version > 910 -BuildRequires: krb5-devel -%endif -%endif BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files ++++++ qt-4.4-update.diff ++++++ ++++ 6980 lines (skipped) ++++ between libqt4/qt-4.4-update.diff ++++ and libqt4/qt-4.4-update.diff ++++++ revert-psql-detection.diff ++++++ --- configure +++ configure @@ -4153,10 +4153,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do if "$WHICH" pg_config >/dev/null 2>&1; then QT_CFLAGS_PSQL=`pg_config --includedir 2>/dev/null` QT_LFLAGS_PSQL=`pg_config --libdir 2>/dev/null` - QT_LIBS_PSQL=`pg_config --libs 2>/dev/null` fi [ -z "$QT_CFLAGS_PSQL" ] || QT_CFLAGS_PSQL="-I$QT_CFLAGS_PSQL" - [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL $QT_LIBS_PSQL" + [ -z "$QT_LFLAGS_PSQL" ] || QT_LFLAGS_PSQL="-L$QT_LFLAGS_PSQL -lpq" if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/psql "PostgreSQL" $QT_LFLAGS_PSQL $L_FLAGS $QT_CFLAGS_PSQL $I_FLAGS $l_FLAGS; then if [ "$CFG_SQL_psql" = "auto" ]; then CFG_SQL_psql=plugin ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org