Hello community, here is the log from the commit of package libqt4 checked in at Mon Feb 4 17:38:32 CET 2008. -------- --- libqt4/libqt4.changes 2008-01-31 22:07:06.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4.changes 2008-02-04 10:45:36.726961000 +0100 @@ -1,0 +2,7 @@ +Sun Feb 3 23:30:27 CET 2008 - dmueller@suse.de + +- update to 4.4 snapshot 20080202: + * also licensed under the GPLv3, in addition to GPLv2 + * bugfixes + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change Old: ---- 0179-transient-hack.diff 0189-fix-q3toolbar-qcombobox-signal-slot.diff 0200-fix-qsslsocket-waitfor.diff 0206-fix-meta-modifier.diff qt4-pedantic-headers.diff qtextedit-capitalization.diff qt-x11-opensource-src-4.3.90-snapshot-20080110.tar.bz2 New: ---- no-documentation-test.diff qt-x11-opensource-src-4.3.90-snapshot-20080202.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.Rs3213/_old 2008-02-04 17:38:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Rs3213/_new 2008-02-04 17:38:07.000000000 +0100 @@ -13,7 +13,7 @@ Name: libqt4-devel-doc-data BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libqt4-devel pkgconfig -BuildRequires: openssl-devel +BuildRequires: libqt4-sql-sqlite openssl-devel sqlite-devel %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -26,10 +26,10 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.90 -Release: 11 +Release: 14 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.90-snapshot-20080110 +%define rversion 4.3.90-snapshot-20080202 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -45,25 +45,20 @@ Patch7: FIXME.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch24: qt4-pedantic-headers.diff -Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff Patch29: 0178-transparency-window-types.diff -Patch30: 0179-transient-hack.diff Patch31: 0180-window-role.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff -Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff Patch43: 0195-compositing-properties.diff Patch46: 0172-prefer-xrandr-over-xinerama.diff -Patch47: 0200-fix-qsslsocket-waitfor.diff Patch48: 0203-qtexthtmlparser-link-color.diff Patch49: javascriptcore-bufferoverflow.diff -Patch50: 0206-fix-meta-modifier.diff Patch51: fix-ppc-constraints.diff +Patch52: no-documentation-test.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 + %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 %else %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 @@ -93,22 +88,19 @@ #%patch7 %endif #%patch8 -#%patch24 -#%patch25 %patch27 #%patch29 -%patch30 #%patch31 %patch39 %patch40 -%patch41 #%patch43 %patch46 -#%patch47 %patch48 %patch49 -%patch50 %patch51 +%if "%name" == "libqt4" +%patch52 +%endif # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -118,20 +110,25 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" for f in mkspecs/linux-g*/qmake.conf; do 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 export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options +echo yes | ./configure %common_options -plugin-sql-sqlite pushd src make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic popd +pushd tools +make %{?jobs:-j%jobs} sub-assistant +popd +make %{?jobs:-j%jobs} docs %install export QTDIR=$PWD -make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs +#make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs +mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name +cp -r doc/html-* $RPM_BUILD_ROOT/%_docdir/%base_name pushd examples make INSTALL_ROOT=$RPM_BUILD_ROOT install popd @@ -143,10 +140,14 @@ %files %defattr(-,root,root,755) -/usr/share/doc/packages/libqt4/html -/usr/share/doc/packages/libqt4/examples +/usr/share/doc/packages/%base_name/html-* +/usr/share/doc/packages/%base_name/examples %changelog +* Mon Feb 04 2008 dmueller@suse.de +- update to 4.4 snapshot 20080202: + * also licensed under the GPLv3, in addition to GPLv2 + * bugfixes * Thu Jan 31 2008 dmueller@suse.de - fix ppc miscompile due to wrong asm constraints (bnc #356200) * Wed Jan 30 2008 schwab@suse.de ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.Rs3213/_old 2008-02-04 17:38:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Rs3213/_new 2008-02-04 17:38:07.000000000 +0100 @@ -36,10 +36,10 @@ Provides: qt # COMMON-BEGIN Version: 4.3.90 -Release: 11 +Release: 13 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.90-snapshot-20080110 +%define rversion 4.3.90-snapshot-20080202 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -55,25 +55,20 @@ Patch7: FIXME.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch24: qt4-pedantic-headers.diff -Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff Patch29: 0178-transparency-window-types.diff -Patch30: 0179-transient-hack.diff Patch31: 0180-window-role.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff -Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff Patch43: 0195-compositing-properties.diff Patch46: 0172-prefer-xrandr-over-xinerama.diff -Patch47: 0200-fix-qsslsocket-waitfor.diff Patch48: 0203-qtexthtmlparser-link-color.diff Patch49: javascriptcore-bufferoverflow.diff -Patch50: 0206-fix-meta-modifier.diff Patch51: fix-ppc-constraints.diff +Patch52: no-documentation-test.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 + %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 %else %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 @@ -104,22 +99,19 @@ #%patch7 %endif #%patch8 -#%patch24 -#%patch25 %patch27 #%patch29 -%patch30 #%patch31 %patch39 %patch40 -%patch41 #%patch43 %patch46 -#%patch47 %patch48 %patch49 -%patch50 %patch51 +%if "%name" == "libqt4" +%patch52 +%endif # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -272,12 +264,11 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" sed -i -e "s,^\(CXXFLAGS[ \t]*=.*\),\1 $RPM_OPT_FLAGS," qmake/Makefile.unix export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options -no-sql-sqlite -no-sql-sqlite2 +echo yes | ./configure %common_options -no-sql-sqlite -no-sql-sqlite2 # -nomake examples make %{?jobs:-j %jobs} %install @@ -285,7 +276,7 @@ # 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" {} \; -find $RPM_BUILD_ROOT/%_docdir/%name -type f -name 'lib*.a' -exec rm {} \; +#find $RPM_BUILD_ROOT/%_docdir/%name -type f -name 'lib*.a' -exec rm {} \; find $RPM_BUILD_ROOT/%_libdir -type f -name '*la' -print -exec perl -pi -e "s, -L$RPM_BUILD_DIR/?\S+,,g" {} \; # insanity ... 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," {} \; @@ -396,7 +387,9 @@ %plugindir/imageformats %plugindir/inputmethods %plugindir/accessible +%if %suse_version > 1010 %plugindir/script +%endif %files -n libQtWebKit4 %defattr(-,root,root,755) @@ -452,7 +445,7 @@ %files devel-doc %defattr(-,root,root,755) /usr/bin/assistant -/usr/bin/assistant_new +/usr/bin/assistant_adp /usr/bin/qcollectiongenerator /usr/bin/qtdemo %if %suse_version > 910 @@ -468,6 +461,10 @@ %_libdir/libQtSql*.so.* %changelog +* Mon Feb 04 2008 dmueller@suse.de +- update to 4.4 snapshot 20080202: + * also licensed under the GPLv3, in addition to GPLv2 + * bugfixes * Thu Jan 31 2008 dmueller@suse.de - fix ppc miscompile due to wrong asm constraints (bnc #356200) * Wed Jan 30 2008 schwab@suse.de ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Rs3213/_old 2008-02-04 17:38:07.000000000 +0100 +++ /var/tmp/diff_new_pack.Rs3213/_new 2008-02-04 17:38:07.000000000 +0100 @@ -14,6 +14,9 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel mysql-devel BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel +%if %suse_version < 1100 +BuildRequires: krb5-devel openssl-devel pam-devel readline-devel +%endif BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -26,10 +29,10 @@ # COMMON-BEGIN # COMMON-BEGIN Version: 4.3.90 -Release: 7 +Release: 8 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.3.90-snapshot-20080110 +%define rversion 4.3.90-snapshot-20080202 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -45,25 +48,20 @@ Patch7: FIXME.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch24: qt4-pedantic-headers.diff -Patch25: qtextedit-capitalization.diff Patch27: 0167-fix-group-reading.diff Patch29: 0178-transparency-window-types.diff -Patch30: 0179-transient-hack.diff Patch31: 0180-window-role.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff -Patch41: 0189-fix-q3toolbar-qcombobox-signal-slot.diff Patch43: 0195-compositing-properties.diff Patch46: 0172-prefer-xrandr-over-xinerama.diff -Patch47: 0200-fix-qsslsocket-waitfor.diff Patch48: 0203-qtexthtmlparser-link-color.diff Patch49: javascriptcore-bufferoverflow.diff -Patch50: 0206-fix-meta-modifier.diff Patch51: fix-ppc-constraints.diff +Patch52: no-documentation-test.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 + %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 %else %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/%{base_name} -examplesdir %_docdir/%{base_name}/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 @@ -92,22 +90,19 @@ #%patch7 %endif #%patch8 -#%patch24 -#%patch25 %patch27 #%patch29 -%patch30 #%patch31 %patch39 %patch40 -%patch41 #%patch43 %patch46 -#%patch47 %patch48 %patch49 -%patch50 %patch51 +%if "%name" == "libqt4" +%patch52 +%endif # be sure not to use them rm -rf src/3rdparty/{libjpeg,freetype,libpng,zlib,libtiff} # COMMON-END @@ -183,7 +178,6 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" for f in mkspecs/linux-g*/qmake.conf; do sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f done @@ -251,6 +245,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Mon Feb 04 2008 dmueller@suse.de +- update to 4.4 snapshot 20080202: + * also licensed under the GPLv3, in addition to GPLv2 + * bugfixes * Thu Jan 31 2008 dmueller@suse.de - fix ppc miscompile due to wrong asm constraints (bnc #356200) * Wed Jan 30 2008 schwab@suse.de ++++++ libqt4-devel-doc-data.spec.in ++++++ --- libqt4/libqt4-devel-doc-data.spec.in 2007-12-06 16:19:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc-data.spec.in 2008-02-03 23:29:56.000000000 +0100 @@ -13,7 +13,7 @@ Name: libqt4-devel-doc-data BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel pkgconfig libqt4-devel -BuildRequires: openssl-devel +BuildRequires: openssl-devel sqlite-devel libqt4-sql-sqlite %if 0%{?suse_version} BuildRequires: update-desktop-files %endif @@ -30,20 +30,25 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" for f in mkspecs/linux-g*/qmake.conf; do 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 export MAKEFLAGS="%{?jobs:-j %jobs}" -echo yes | ./configure %common_options +echo yes | ./configure %common_options -plugin-sql-sqlite pushd src make %{?jobs:-j%jobs} sub-moc sub-rcc sub-uic popd +pushd tools +make %{?jobs:-j%jobs} sub-assistant +popd +make %{?jobs:-j%jobs} docs %install export QTDIR=$PWD -make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs +#make INSTALL_ROOT=$RPM_BUILD_ROOT install_htmldocs +mkdir -p $RPM_BUILD_ROOT/%_docdir/%base_name +cp -r doc/html-* $RPM_BUILD_ROOT/%_docdir/%base_name pushd examples make INSTALL_ROOT=$RPM_BUILD_ROOT install popd @@ -55,7 +60,7 @@ %files %defattr(-,root,root,755) -/usr/share/doc/packages/libqt4/html -/usr/share/doc/packages/libqt4/examples +/usr/share/doc/packages/%base_name/html-* +/usr/share/doc/packages/%base_name/examples %changelog ++++++ libqt4-sql-plugins.spec.in ++++++ --- libqt4/libqt4-sql-plugins.spec.in 2007-12-06 16:19:32.000000000 +0100 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-sql-plugins.spec.in 2008-02-03 02:49:14.000000000 +0100 @@ -13,7 +13,10 @@ Name: libqt4-sql-plugins BuildRequires: cups-devel freeglut-devel libjpeg-devel libpng-devel mysql-devel -BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel +BuildRequires: pkgconfig postgresql-devel sqlite-devel unixODBC-devel +%if %suse_version < 1100 +BuildRequires: pam-devel krb5-devel openssl-devel readline-devel +%endif BuildRequires: libqt4-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -96,7 +99,6 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ -RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" for f in mkspecs/linux-g*/qmake.conf; do sed -i -e "/QMAKE_CFLAGS_RELEASE[ \t]*=/s,\$, $RPM_OPT_FLAGS," $f done ++++++ no-documentation-test.diff ++++++ --- projects.pro +++ projects.pro @@ -142,25 +142,3 @@ usagereporter.files=$$QT_BUILD_TREE/bin/qtusagereporter INSTALLS += usagereporter } - -### documentation #### - -# force at least one build of qdoc and qt documentation -!wince*:!cross_compile:SUBDIRS += tools/qdoc3 - -# this file contains all required defines to build the documentation -include(tools/qdoc3/documentation.pri) - -# Target for building qdoc, which is used by both ADP and QCH style docs -qdoc.commands = ($$BUILD_QDOC) -QMAKE_EXTRA_TARGETS += qdoc - -# ADP style documentation target -adp_docs.depends += qdoc -adp_docs.commands = ($$QDOC $$ADP_DOCS_QDOCCONF_FILE) -QMAKE_EXTRA_TARGETS += adp_docs - -# Qt Compressed Help style documentation target -docs.depends += qdoc -docs.commands = $$QT_DOCUMENTATION -QMAKE_EXTRA_TARGETS += docs ++++++ qt-x11-opensource-src-4.3.90-snapshot-20080110.tar.bz2 -> qt-x11-opensource-src-4.3.90-snapshot-20080202.tar.bz2 ++++++ libqt4/qt-x11-opensource-src-4.3.90-snapshot-20080110.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-x11-opensource-src-4.3.90-snapshot-20080202.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