Hello community, here is the log from the commit of package libqt4 checked in at Sat Jun 9 01:03:34 CEST 2007. -------- --- libqt4/libqt4.changes 2007-06-01 13:24:24.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2007-06-08 17:49:36.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Jun 8 17:49:20 CEST 2007 - dmueller@suse.de + +- fix build for old distributions + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.sL1133/_old 2007-06-09 01:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.sL1133/_new 2007-06-09 01:03:11.000000000 +0200 @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.0 -Release: 1 +Release: 5 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -47,9 +47,9 @@ Patch27: 0167-fix-group-reading.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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 + %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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/libqt4 -examplesdir %_docdir/libqt4/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 %else - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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-sm -no-opengl + %define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet -no-xrender -no-xrandr -no-xinerama -no-xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor %endif %description @@ -118,6 +118,8 @@ /usr/share/doc/packages/libqt4/examples %changelog +* Fri Jun 08 2007 - dmueller@suse.de +- fix build for old distributions * Fri Jun 01 2007 - dmueller@suse.de - update to final 4.3.0 release: * for changelog, see included changes-4.3.0 ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.sL1133/_old 2007-06-09 01:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.sL1133/_new 2007-06-09 01:03:11.000000000 +0200 @@ -16,8 +16,13 @@ %if 0%{?suse_version} BuildRequires: update-desktop-files %endif +%if %suse_version > 910 +BuildRequires: xorg-x11-devel +%else +BuildRequires: XFree86-devel XFree86-libs +%endif %if %suse_version > 1010 -BuildRequires: dbus-1-devel openssl-devel +BuildRequires: dbus-1-devel openssl-devel xorg-x11 %endif %if %suse_version > 1020 BuildRequires: fdupes @@ -31,7 +36,7 @@ Provides: qt # COMMON-BEGIN Version: 4.3.0 -Release: 1 +Release: 5 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -52,9 +57,9 @@ Patch27: 0167-fix-group-reading.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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 + %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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/libqt4 -examplesdir %_docdir/libqt4/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 %else - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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-sm -no-opengl + %define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet -no-xrender -no-xrandr -no-xinerama -no-xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor %endif %description @@ -93,11 +98,15 @@ %package devel Group: Development/Libraries/X11 Summary: Qt Development Kit -Requires: xorg-x11-devel zlib-devel c++_compiler pkgconfig -Requires: freetype2-devel libmng-devel libpng-devel dbus-1-devel -Requires: openssl-devel +Requires: zlib-devel c++_compiler pkgconfig +Requires: freetype2-devel libmng-devel libpng-devel libtiff-devel +%if %suse_version > 910 +Requires: xorg-x11-devel +%else +Requires: XFree86-devel +%endif %if %suse_version > 1010 -Requires: Mesa-devel +Requires: Mesa-devel dbus-1-devel openssl-devel %endif Requires: %name = %version Provides: dbus-1-qt-devel < 0.63 @@ -332,9 +341,13 @@ %endif /usr/share/applications/qt4config.desktop # designer.png is referenced by qt4config.desktop +%if %suse_version > 910 /usr/share/pixmaps/designer.png +%endif %_libdir/libQtGui*.so.* +%if %suse_version > 910 %_libdir/libQtOpenGL*.so.* +%endif %_libdir/libQtSvg.so.* %_libdir/libQtScript.so.* %_libdir/libQtDesigner*.so.* @@ -389,7 +402,9 @@ /usr/include/* /usr/share/applications/designer4.desktop /usr/share/applications/linguist4.desktop +%if %suse_version > 910 /usr/share/pixmaps/linguist.png +%endif /usr/share/qt4/mkspecs /usr/share/qt4/q3porting.xml @@ -397,7 +412,9 @@ %defattr(-,root,root,755) /usr/bin/assistant /usr/bin/qtdemo +%if %suse_version > 910 /usr/share/pixmaps/assistant.png +%endif /usr/share/applications/assistant4.desktop /usr/%_lib/qt4/demos %_docdir/libqt4/demos @@ -408,6 +425,8 @@ %_libdir/libQtSql*.so.* %changelog +* Fri Jun 08 2007 - dmueller@suse.de +- fix build for old distributions * Fri Jun 01 2007 - dmueller@suse.de - update to final 4.3.0 release: * for changelog, see included changes-4.3.0 ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.sL1133/_old 2007-06-09 01:03:11.000000000 +0200 +++ /var/tmp/diff_new_pack.sL1133/_new 2007-06-09 01:03:11.000000000 +0200 @@ -12,9 +12,9 @@ # nodebuginfo Name: libqt4-sql-plugins -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel mysql-devel -BuildRequires: libqt4 pkgconfig postgresql-devel sqlite-devel unixODBC-devel -BuildRequires: libtiff-devel openssl-devel +BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel mysql-devel +BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel +BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -26,7 +26,7 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.0 -Release: 1 +Release: 2 %define x11_free -x11-opensource-src- %define rversion 4.3.0 Source: qt%x11_free%rversion.tar.bz2 @@ -47,9 +47,9 @@ Patch27: 0167-fix-group-reading.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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 + %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -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/libqt4 -examplesdir %_docdir/libqt4/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 %else - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -xrender -xrandr -xinerama -xshape -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/libqt4 -examplesdir %_docdir/libqt4/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-sm -no-opengl + %define common_options -fast -no-separate-debug-info -shared -xkb -no-tablet -no-xrender -no-xrandr -no-xinerama -no-xshape -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/libqt4 -examplesdir %_docdir/libqt4/examples -demosdir %_libdir/qt4/demos -plugindir %plugindir -translationdir /usr/share/qt4/translations -iconv -sysconfdir /etc/settings -datadir /usr/share/qt4/ -no-pch -no-exceptions -system-libtiff -no-sm -no-opengl -no-xcursor %endif %description @@ -156,7 +156,12 @@ sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f done sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix -echo yes | ./configure %common_options -system-sqlite \ +%if %suse_version > 910 + OPTIONS="-system-sqlite" +%else + OPTIONS="" +%endif +echo yes | ./configure %common_options $OPTIONS \ -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/ \ @@ -217,6 +222,8 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Fri Jun 08 2007 - dmueller@suse.de +- fix build for old distributions * Fri Jun 01 2007 - dmueller@suse.de - update to final 4.3.0 release: * for changelog, see included changes-4.3.0 ++++++ libqt4-sql-plugins.spec.in ++++++ --- libqt4/libqt4-sql-plugins.spec.in 2007-04-25 15:44:55.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-sql-plugins.spec.in 2007-06-07 09:23:00.000000000 +0200 @@ -12,9 +12,9 @@ # nodebuginfo Name: libqt4-sql-plugins -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel mysql-devel -BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel libqt4 -BuildRequires: openssl-devel libtiff-devel +BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel mysql-devel +BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel +BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -97,7 +97,12 @@ sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f done sed -i -e "s,^CXXFLAGS[ \t]*=,& $RPM_OPT_FLAGS," qmake/Makefile.unix -echo yes | ./configure %common_options -system-sqlite \ +%if %suse_version > 910 + OPTIONS="-system-sqlite" +%else + OPTIONS="" +%endif +echo yes | ./configure %common_options $OPTIONS \ -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/ \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@Hilbert.suse.de