Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Mon Jun 27 15:26:41 CEST 2011.
-------- --- libqt4/libqt4.changes 2011-05-30 15:01:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2011-06-20 18:07:16.000000000 +0200 @@ -1,0 +2,10 @@ +Mon Jun 20 16:05:53 UTC 2011 - [email protected] + +- build a libqt4-private-headers-devel for qt-creator build + +------------------------------------------------------------------- +Mon Jun 13 17:33:04 CEST 2011 - [email protected] + +- remove spurious executable permissions + +------------------------------------------------------------------- --- libqt4/libqt4-devel-doc.changes 2011-05-30 15:01:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-06-13 17:33:16.000000000 +0200 @@ -1,0 +2,5 @@ +Mon Jun 13 17:33:04 CEST 2011 - [email protected] + +- remove spurious executable permissions + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.000000000 +0200 @@ -31,7 +31,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 2 +Release: 3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -205,6 +205,7 @@ make %{?_smp_mflags} -C tools/assistant make %{?_smp_mflags} -C demos make %{?_smp_mflags} -C examples +make %{?_smp_mflags} docs %install export QTDIR=$PWD @@ -223,6 +224,8 @@ # 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 "*.css" -print0 | xargs -0 chmod a-x +find $RPM_BUILD_ROOT/usr/share -name "*.js" -print0 | xargs -0 chmod a-x # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.000000000 +0200 @@ -54,7 +54,7 @@ Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 2 +Release: 5 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -112,6 +112,7 @@ handling. + %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -174,10 +175,12 @@ Provides: qt-devel = 4.4.0 Provides: dbus-1-qt = 0.63 Provides: qt-dbus-1 = 4.2.0 +Provides: libQtDeclarative-devel = 4.6.0 Obsoletes: dbus-1-qt < 0.63 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 %description devel You need this package, if you want to compile programs with Qt. It @@ -187,10 +190,6 @@ -Authors: --------- - Qt Software - %package -n libqt4-sql-sqlite License: GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -206,10 +205,6 @@ -Authors: --------- - Qt Software - %package x11 License: GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -228,10 +223,6 @@ -Authors: --------- - Qt Software - %if %with_qt3support %package qt3support @@ -254,11 +245,6 @@ handling. - -Authors: --------- - Qt Software - %endif %package sql @@ -281,11 +267,6 @@ will need also a plugin package for a supported SQL server. - -Authors: --------- - Qt Software - %package -n libQtWebKit4 License: GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ @@ -302,20 +283,12 @@ porting this fabulous engine back to Qt. - -Authors: --------- - Qt Software - - %package -n libQtWebKit-devel License: GPLv2 ; GPLv3 Group: Development/Libraries/C and C++ Summary: Open source Web Browser engine based on Qt4 Requires: libQtWebKit4 = %version Requires: libqt4-devel = %version -Provides: libQtDeclarative-devel = 4.6.0 -Obsoletes: libQtDeclarative-devel <= 4.6.0 %description -n libQtWebKit-devel WebKit is an open source web browser engine. WebKit's HTML and JavaScript @@ -325,10 +298,17 @@ porting this fabulous engine back to Qt. +%package private-headers-devel +License: GPLv2 ; GPLv3 +Group: Development/Libraries/C and C++ +Summary: Non-ABI stabile experimental API +Requires: libqt4-x11 = %version libqt4-devel = %version -Authors: --------- - Qt Software +%description private-headers-devel +This package provides private headers of libqt4-devel that are normally +not used by application development and that do not have any ABI or +API guarantees. The packages that build against these have to require +the exact Qt version. %if %with_phonon @@ -346,11 +326,6 @@ used. - -Authors: --------- - Matthias Kretz - %package -n phonon-devel License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction @@ -366,11 +341,6 @@ used. - -Authors: --------- - Matthias Kretz - %package -n libphonon4 License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction @@ -385,10 +355,6 @@ -Authors: --------- - Matthias Kretz - %if %with_phonon_backend %package -n phonon-backend-gstreamer-0_10 @@ -405,12 +371,6 @@ used. - -Authors: --------- - Matthias Kretz - - %package -n phonon-backend-xine License: LGPLv2.0+ Summary: Phonon Multimedia Platform Abstraction @@ -426,11 +386,6 @@ used. - -Authors: --------- - Matthias Kretz - %endif %endif @@ -482,6 +437,20 @@ ln -s /usr/include $RPM_BUILD_ROOT/%_libdir/qt4/include ln -s %_libdir $RPM_BUILD_ROOT/%_libdir/qt4/lib ln -s %_bindir $RPM_BUILD_ROOT/%_libdir/qt4/bin + +# install private headers manually instead of using -developer-build +for comb in QtDeclarative/declarative QtCore/corelib QtScript/script QtGui/gui; do + d=${comb%%/*} + s=${comb##*/} + mkdir -p $RPM_BUILD_ROOT/usr/include/$d/private + for h in include/$d/private/*_p.h; do + header=$(find src/$s/ -name "$(basename $h)" | head -n 1) + if test -r "$header"; then + install -m 644 $header $RPM_BUILD_ROOT/usr/include/$d/private + fi + done +done + %fdupes %{buildroot}/usr/include # # we do not package qvfb, and assistant in devel-doc @@ -537,7 +506,6 @@ %dir %plugindir %dir %plugindir/script %dir %plugindir/codecs -%dir %plugindir/qmltooling %dir /usr/share/qt4/translations %plugindir/codecs/* %dir /usr/share/qt4 @@ -547,7 +515,10 @@ %_libdir/libQtXml.so.* %_libdir/libQtTest.so.* %_libdir/libQtCLucene.so.* +%_libdir/libQtXmlPatterns.so.* /usr/bin/qdbus +/usr/bin/xmlpatterns +/usr/bin/xmlpatternsvalidator /usr/share/qt4/translations/qt_*.qm %files x11 @@ -569,6 +540,7 @@ %_libdir/libQtDesigner*.so.* %_libdir/libQtHelp.so.* %_libdir/libQtMultimedia.so.* +%_libdir/libQtDeclarative.so.* %dir %plugindir/iconengines %dir %plugindir/imageformats %dir %plugindir/inputmethods @@ -577,12 +549,15 @@ %dir %plugindir/bearer %dir %plugindir/imports %dir %plugindir/imports/Qt +%dir %plugindir/qmltooling %plugindir/iconengines/* %plugindir/imageformats/* %plugindir/inputmethods/* %plugindir/accessible/* %plugindir/graphicssystems/* %plugindir/bearer/* +%plugindir/imports/Qt/* +%plugindir/qmltooling/libtcpserver.so /usr/share/qt4/phrasebooks /usr/share/qt4/translations/qtconfig_*.qm %plugindir/script/libqtscriptdbus.so @@ -597,51 +572,26 @@ %files -n libQtWebKit4 %defattr(-,root,root,755) -/usr/bin/xmlpatterns -/usr/bin/xmlpatternsvalidator %dir %plugindir/imports/QtWebKit %_libdir/libQtWebKit.so.* -%_libdir/libQtXmlPatterns.so.* -%_libdir/libQtDeclarative.so.* -%plugindir/imports/Qt/* %plugindir/imports/QtWebKit/* %plugindir/designer/libqwebview.so %plugindir/designer/libqdeclarativeview.so -%plugindir/qmltooling/libtcpserver.so %files -n libQtWebKit-devel %defattr(-,root,root,755) /usr/include/QtWebKit -/usr/include/QtXmlPatterns -/usr/include/QtDeclarative -%_libdir/libQtXmlPatterns.so -%_libdir/libQtXmlPatterns.prl -%_libdir/libQtXmlPatterns.la %_libdir/libQtWebKit.so %_libdir/libQtWebKit.prl %_libdir/libQtWebKit.la -%_libdir/libQtDeclarative.so -%_libdir/libQtDeclarative.prl -%_libdir/libQtDeclarative.la %_libdir/pkgconfig/QtWebKit.pc -%_libdir/pkgconfig/QtXmlPatterns.pc -%_libdir/pkgconfig/QtDeclarative.pc %files devel %defattr(-,root,root,755) %exclude %_libdir/libQtWebKit.la %exclude %_libdir/libQtWebKit.prl %exclude %_libdir/libQtWebKit.so -%exclude %_libdir/libQtDeclarative.so -%exclude %_libdir/libQtDeclarative.prl -%exclude %_libdir/libQtDeclarative.la -%exclude %_libdir/libQtXmlPatterns.la -%exclude %_libdir/libQtXmlPatterns.prl -%exclude %_libdir/libQtXmlPatterns.prl -%exclude %_libdir/libQtXmlPatterns.so %exclude %_libdir/pkgconfig/QtWebKit.pc -%exclude %_libdir/pkgconfig/QtXmlPatterns.pc -%exclude %_libdir/pkgconfig/QtDeclarative.pc /usr/bin/rcc /usr/bin/uic %if %with_qt3support @@ -687,6 +637,11 @@ /usr/include/QtTest /usr/include/QtUiTools /usr/include/QtXml +/usr/include/QtXmlPatterns +%dir /usr/include/QtDeclarative +/usr/include/QtDeclarative/QDeclarative* +/usr/include/QtDeclarative/qdeclarative*h +/usr/include/QtDeclarative/QtDeclarative /usr/share/applications/designer4.desktop /usr/share/applications/linguist4.desktop /usr/share/pixmaps/linguist.png @@ -698,6 +653,13 @@ /usr/share/qt4/mkspecs /usr/share/qt4/q3porting.xml +%files private-headers-devel +%defattr(-,root,root,755) +/usr/include/QtDeclarative/private +/usr/include/QtCore/private +/usr/include/QtScript/private +/usr/include/QtGui/private + %files sql %defattr(-,root,root,755) %dir %plugindir/sqldrivers ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.000000000 +0200 @@ -29,7 +29,7 @@ # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN Version: 4.7.3 -Release: 2 +Release: 3 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.aZlMHg/_old 2011-06-27 15:21:26.000000000 +0200 +++ /var/tmp/diff_new_pack.aZlMHg/_new 2011-06-27 15:21:26.000000000 +0200 @@ -102,6 +102,7 @@ make %{?_smp_mflags} -C tools/assistant make %{?_smp_mflags} -C demos make %{?_smp_mflags} -C examples +make %{?_smp_mflags} docs %install export QTDIR=$PWD @@ -120,6 +121,9 @@ # 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 # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
