Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Tue Mar 3 22:26:47 CET 2009. -------- --- libqt4/libqt4.changes 2009-02-11 19:43:02.000000000 +0100 +++ libqt4/libqt4.changes 2009-03-03 10:48:42.000000000 +0100 @@ -1,0 +2,13 @@ +Tue Mar 3 10:34:50 CET 2009 - dmueller@suse.de + +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option + +------------------------------------------------------------------- +Sun Mar 1 22:07:48 CET 2009 - dmueller@suse.de + +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change calling whatdependson for head-i586 Old: ---- qt-x11-opensource-src-4.5.0-rc1.tar.bz2 New: ---- build-install-qdoc3.diff qt-x11-opensource-src-4.5.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:20.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:20.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4-devel-doc-data (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,7 +26,7 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: Documentation/HTML AutoReqProv: on Summary: Qt Documentation (Architecture Independent Files) @@ -34,11 +34,11 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -72,6 +72,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -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 @@ -129,6 +130,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -175,6 +177,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files %defattr(-,root,root,755) @@ -184,6 +190,13 @@ /usr/share/doc/packages/%base_name/src %changelog +* Tue Mar 03 2009 dmueller@suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller@suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller@suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo@suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4 (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -31,8 +31,8 @@ BuildRequires: clucene-core-devel %endif %define with_qt3support 1 -Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +Url: http://www.qtsoftware.com +License: GPL v3 only; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on Summary: C++ Program Library, Core Components @@ -46,11 +46,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -84,6 +84,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -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 @@ -106,7 +107,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %prep %define plugindir %_libdir/qt4/plugins @@ -142,6 +143,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -183,7 +185,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %package -n libqt4-sql-sqlite License: GPL v2 only; GPL v3 only @@ -202,7 +204,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %package x11 License: GPL v2 only; GPL v3 only @@ -224,7 +226,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %if %with_qt3support @@ -251,7 +253,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %endif @@ -280,7 +282,7 @@ Authors: -------- - Troll Tech AS, Norway + Qt Software %build export QTDIR=$PWD @@ -313,11 +315,6 @@ find $RPM_BUILD_ROOT/%_libdir -type f -name '*pc' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; -exec sed -i -e "s,^moc_location=.*,moc_location=/usr/bin/moc," -e "s,uic_location=.*,uic_location=/usr/bin/uic," {} \; find $RPM_BUILD_ROOT/%_libdir/ -name 'lib*.a' -exec chmod -x -- {} \; mkdir -p $RPM_BUILD_ROOT/%plugindir/sqldrivers -for ch in changes-*; do - if test -f $ch; then - install -D -m 644 $ch $RPM_BUILD_ROOT/%_defaultdocdir/%name/$(basename $ch) - fi -done # overwrite config install -m 644 fullconfig/qconfig.pri $RPM_BUILD_ROOT/usr/share/qt4/mkspecs/qconfig.pri install -m 644 fullconfig/qconfig.h $RPM_BUILD_ROOT/usr/include/QtCore/ @@ -337,6 +334,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %post -p /sbin/ldconfig @@ -358,6 +359,7 @@ %files %defattr(-,root,root,755) +%doc changes-* *.TXT LICENSE.GPL3 %dir %_libdir/qt4 %dir %plugindir %if %suse_version > 910 @@ -370,7 +372,6 @@ %dir %plugindir/accessible %dir %plugindir/graphicssystems %dir /usr/share/qt4 -#%doc %_defaultdocdir/%name/changes-* %_libdir/libQtCore*.so.* %_libdir/libQtNetwork*.so.* %_libdir/libQtXml*.so.* @@ -431,6 +432,7 @@ %if %with_qt3support /usr/bin/uic3 %endif +/usr/bin/qdoc3 /usr/bin/moc /usr/bin/qmake /usr/bin/designer @@ -495,6 +497,13 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Tue Mar 03 2009 dmueller@suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller@suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller@suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo@suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.4.90+4.5.0rc1) +# spec file for package libqt4-sql-plugins (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,17 +27,17 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com/ -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: Development/Libraries/C and C++ AutoReqProv: on Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -71,6 +71,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -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 @@ -127,6 +128,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -230,6 +232,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files -n libqt4-sql-unixODBC %defattr(-,root,root,755) @@ -247,6 +253,13 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Tue Mar 03 2009 dmueller@suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller@suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller@suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo@suse.de ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:21.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.4.90+4.5.0rc1) +# spec file for package libQtWebKit-devel (Version 4.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -29,7 +29,7 @@ BuildRequires: update-desktop-files %endif Url: http://www.trolltech.com -License: GPL v2 only; GPL v3 only +License: GPL v3 only; LGPL v2.1 or later Group: System/Libraries AutoReqProv: on Summary: C++ Program Library, Core Components @@ -37,11 +37,11 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.90+4.5.0rc1 -Release: 4 +Version: 4.5.0 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.5.0-rc1 +%define rversion 4.5.0 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -75,6 +75,7 @@ Patch103: ppc64-buildfix.diff Patch104: qlibraryinfo-fixes.diff Patch105: disable-callgrind.diff +Patch106: build-install-qdoc3.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 %define common_options -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 @@ -133,6 +134,7 @@ %patch103 %patch104 %patch105 +%patch106 # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -249,6 +251,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %if %suse_version > 910 %post -n libQtWebKit4 -p /sbin/ldconfig @@ -301,6 +307,13 @@ /usr/bin/qt4-browser %changelog +* Tue Mar 03 2009 dmueller@suse.de +- update to 4.5.0 final: + * licensing change. LGPLv2.1 or later is a new option +* Sun Mar 01 2009 dmueller@suse.de +- update to 4.5.0 RC2: + * for detailed changelog, see included changes-4.5.0 +- build && install qdoc3, needed for qt-creator * Wed Feb 11 2009 dmueller@suse.de - use minimal-toc for ppc64 * Wed Feb 11 2009 coolo@suse.de ++++++ build-install-qdoc3.diff ++++++ --- tools/qdoc3/qdoc3.pro +++ tools/qdoc3/qdoc3.pro @@ -106,3 +106,6 @@ win32 { QT_WINCONFIG = debug } } + +target.path=$$[QT_INSTALL_BINS] +INSTALLS += target --- tools/tools.pro +++ tools/tools.pro @@ -25,6 +25,7 @@ mac { contains(QT_CONFIG, dbus):SUBDIRS += qdbus !wince*:contains(QT_CONFIG, xmlpatterns): SUBDIRS += xmlpatterns embedded: SUBDIRS += makeqpf +SUBDIRS += qdoc3 CONFIG+=ordered QTDIR_build:REQUIRES = "contains(QT_CONFIG, full-config)" ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -69,6 +69,11 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif + %files %defattr(-,root,root,755) ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -121,6 +121,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %files -n libqt4-sql-unixODBC %defattr(-,root,root,755) ++++++ libQtWebKit-devel.spec.in ++++++ --- /var/tmp/diff_new_pack.R10600/_old 2009-03-03 22:25:22.000000000 +0100 +++ /var/tmp/diff_new_pack.R10600/_new 2009-03-03 22:25:22.000000000 +0100 @@ -144,6 +144,10 @@ %clean rm -rf $RPM_BUILD_ROOT +# no baselibs supplements for older distros +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf +%endif %if %suse_version > 910 ++++++ qt-x11-opensource-src-4.5.0-rc1.tar.bz2 -> qt-x11-opensource-src-4.5.0.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.5.0-rc1.tar.bz2 libqt4/qt-x11-opensource-src-4.5.0.tar.bz2 differ: byte 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