Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri Aug 12 15:27:16 CEST 2011. -------- --- libqt4/libqt4-devel-doc.changes 2011-07-09 10:25:27.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-08-11 21:47:42.000000000 +0200 @@ -1,0 +2,18 @@ +Thu Aug 11 19:29:31 UTC 2011 - aj@suse.de + +- Fix provides/obsoletes. +- There are no jpegs, so remove line to make them non-executable. +- Properly run fdupes in libqt4-devel-doc to save 29 MB. + +------------------------------------------------------------------- +Thu Aug 11 10:13:06 CEST 2011 - munix9@googlemail.com + +- added libjscore.* from 3rdparty dir into libQtWebKit-devel package + (currently needed to compile eg. gambas3) + +------------------------------------------------------------------- +Tue Aug 9 09:41:57 UTC 2011 - meissner@novell.com + +- run fdupes, images should not be executable + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change --- libqt4/libqt4.changes 2011-08-09 15:53:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-08-12 11:55:41.000000000 +0200 @@ -1,0 +2,19 @@ +Fri Aug 12 09:54:52 UTC 2011 - adrian@suse.de + +- remove docdir before collecting files, %doc from 12.1 is not doing + this anymore on purpose + +------------------------------------------------------------------- +Thu Aug 11 19:29:31 UTC 2011 - aj@suse.de + +- Fix provides/obsoletes. +- There are no jpegs, so remove line to make them non-executable. +- Properly run fdupes in libqt4-devel-doc to save 29 MB. + +------------------------------------------------------------------- +Thu Aug 11 10:13:06 CEST 2011 - munix9@googlemail.com + +- added libjscore.* from 3rdparty dir into libQtWebKit-devel package + (currently needed to compile eg. gambas3) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.000000000 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 5 +Release: 6 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -46,9 +46,9 @@ Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version Provides: libqt4-examples = 4.4.0 -Obsoletes: libqt4-examples <= 4.4.0 +Obsoletes: libqt4-examples < 4.4.0 Provides: qt-devel-doc = 4.4.0 -Obsoletes: qt-devel-doc <= 4.4.0 +Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-BEGIN Source: qt%x11_free%rversion.tar.bz2 @@ -227,7 +227,6 @@ # remove some executable flags from image files: find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x -find $RPM_BUILD_ROOT/usr/share -name "*.jpg" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x @@ -253,8 +252,8 @@ rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/usr/include -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/examples -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/demos +%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/ +%fdupes $RPM_BUILD_ROOT%_docdir/%base_name %endif # remove some executable flags from source files: ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.000000000 +0200 @@ -29,7 +29,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 5 +Release: 6 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -148,8 +148,8 @@ Summary: Qt 4 unixODBC plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-unixODBC -Provides: qt-sql-unixODBC +Obsoletes: qt-sql-unixODBC < 4.6.0 +Provides: qt-sql-unixODBC = 4.6.0 %description -n libqt4-sql-unixODBC Qt unixODBC plugin to support databases via unixODBC within Qt @@ -167,8 +167,8 @@ Summary: Qt 4 PostgreSQL plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-postgresql -Provides: qt-sql-postgresql +Obsoletes: qt-sql-postgresql < 4.6.0 +Provides: qt-sql-postgresql = 4.6.0 %description -n libqt4-sql-postgresql Qt SQL plugin to support PostgreSQL servers in Qt applications. @@ -185,8 +185,8 @@ Summary: Qt 4 MySQL support Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-mysql -Provides: qt-sql-mysql +Obsoletes: qt-sql-mysql < 4.6.0 +Provides: qt-sql-mysql = 4.6.0 %description -n libqt4-sql-mysql A plugin to support MySQL server in Qt applications. ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 9 +Release: 11 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -182,7 +182,7 @@ Obsoletes: qt-dbus-1 < 4.2.0 Obsoletes: dbus-1-qt-devel < 0.63 Obsoletes: qt-devel < 4.4.0 -Obsoletes: libQtDeclarative-devel <= 4.6.0 +Obsoletes: libQtDeclarative-devel < 4.6.0 %description devel You need this package, if you want to compile programs with Qt. It @@ -236,8 +236,8 @@ Obsoletes: qt-qt3support-64bit %endif # -Obsoletes: qt-qt3support -Provides: qt-qt3support +Obsoletes: qt-qt3support < 4.6.0 +Provides: qt-qt3support = 4.6.0 Requires: %name = %version %description qt3support @@ -275,7 +275,7 @@ Summary: Open source Web Browser engine based on Qt4 Requires: libqt4-x11 = %version Provides: libQtDeclarative4 = 4.6.0 -Obsoletes: libQtDeclarative4 <= 4.6.0 +Obsoletes: libQtDeclarative4 < 4.6.0 %description -n libQtWebKit4 WebKit is an open source web browser engine. WebKit's HTML and JavaScript @@ -316,6 +316,7 @@ %package -n phonon + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -331,6 +332,7 @@ %package -n phonon-devel + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -347,6 +349,7 @@ %package -n libphonon4 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -364,6 +367,7 @@ %package -n phonon-backend-gstreamer-0_10 + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -379,6 +383,7 @@ %package -n phonon-backend-xine + License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction Group: Development/Libraries/KDE @@ -427,6 +432,9 @@ %install make INSTALL_ROOT=$RPM_BUILD_ROOT install +cp -p src/3rdparty/webkit/JavaScriptCore/release/libjscore.a \ + src/3rdparty/webkit/JavaScriptCore/release/libjscore.prl \ + $RPM_BUILD_ROOT/%_libdir # argggh, qmake is such a piece of <censored> find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec perl -pi -e "s, -L$RPM_BUILD_DIR/\S+,,g" {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*prl' -exec sed -i -e "/^QMAKE_PRL_BUILD_DIR/d" {} \; @@ -460,7 +468,7 @@ %fdupes %{buildroot}/usr/include %fdupes %{buildroot}/usr/share/qt4 -%fdupes %{buildroot}/usr/share/doc/packages/libqt4 +fdupes %{buildroot}/usr/share/doc/packages/libqt4 find %{buildroot}/usr/share/doc/packages/libqt4/src/images/* -type f |xargs chmod a-x # # we do not package qvfb, and assistant in devel-doc @@ -474,6 +482,9 @@ %suse_update_desktop_file -i designer4 Qt Development GUIDesigner %suse_update_desktop_file -i linguist4 Qt Development Translation +# rpm from SUSE 12.1 is not removing docdir on %doc usage anymore +rm -rf $RPM_BUILD_ROOT%_defaultdocdir + %clean rm -rf $RPM_BUILD_ROOT # no baselibs supplements for older distros @@ -594,6 +605,8 @@ %_libdir/libQtWebKit.so %_libdir/libQtWebKit.prl %_libdir/libQtWebKit.la +%_libdir/libjscore.a +%_libdir/libjscore.prl %_libdir/pkgconfig/QtWebKit.pc %files devel ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.000000000 +0200 @@ -38,9 +38,9 @@ Requires: libqt4-devel-doc-data = %version Requires: libqt4-sql-sqlite >= %version Provides: libqt4-examples = 4.4.0 -Obsoletes: libqt4-examples <= 4.4.0 +Obsoletes: libqt4-examples < 4.4.0 Provides: qt-devel-doc = 4.4.0 -Obsoletes: qt-devel-doc <= 4.4.0 +Obsoletes: qt-devel-doc < 4.4.0 # COMMON-BEGIN # COMMON-END @@ -121,7 +121,6 @@ # remove some executable flags from image files: find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x -find $RPM_BUILD_ROOT/usr/share -name "*.jpg" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.css" -print0 | xargs -0 chmod a-x find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x @@ -147,8 +146,8 @@ rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT/usr/include -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/examples -%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/demos +%fdupes $RPM_BUILD_ROOT/usr/%_lib/qt4/ +%fdupes $RPM_BUILD_ROOT%_docdir/%base_name %endif # remove some executable flags from source files: ++++++ libqt4-sql-plugins.spec.in ++++++ --- /var/tmp/diff_new_pack.fhApYF/_old 2011-08-12 15:26:31.000000000 +0200 +++ /var/tmp/diff_new_pack.fhApYF/_new 2011-08-12 15:26:31.000000000 +0200 @@ -42,8 +42,8 @@ Summary: Qt 4 unixODBC plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-unixODBC -Provides: qt-sql-unixODBC +Obsoletes: qt-sql-unixODBC < 4.6.0 +Provides: qt-sql-unixODBC = 4.6.0 %description -n libqt4-sql-unixODBC Qt unixODBC plugin to support databases via unixODBC within Qt @@ -61,8 +61,8 @@ Summary: Qt 4 PostgreSQL plugin Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-postgresql -Provides: qt-sql-postgresql +Obsoletes: qt-sql-postgresql < 4.6.0 +Provides: qt-sql-postgresql = 4.6.0 %description -n libqt4-sql-postgresql Qt SQL plugin to support PostgreSQL servers in Qt applications. @@ -79,8 +79,8 @@ Summary: Qt 4 MySQL support Requires: libqt4-sql = %version Provides: libqt4_sql_backend = %version -Obsoletes: qt-sql-mysql -Provides: qt-sql-mysql +Obsoletes: qt-sql-mysql < 4.6.0 +Provides: qt-sql-mysql = 4.6.0 %description -n libqt4-sql-mysql A plugin to support MySQL server in Qt applications. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org