Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Fri May 27 10:08:09 CEST 2011.
-------- --- libqt4/libqt4-devel-doc.changes 2011-03-28 12:54:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/libqt4/libqt4-devel-doc.changes 2011-05-17 12:44:27.000000000 +0200 @@ -1,0 +2,10 @@ +Thu May 5 00:07:41 CEST 2011 - [email protected] + +- update to 4.7.3: + * bugfixes only + * [QTBUG-18338] blacklist fraudulent SSL certificates + * More details see included changes-4.7.3 file +- merge libqt4-devel-doc-data main spec file back into + a subspecfile of libqt4-devel-doc + +------------------------------------------------------------------- libqt4-sql-plugins.changes: same change libqt4.changes: same change calling whatdependson for head-i586 Old: ---- comodo-blacklisting.diff libqt4-devel-doc-data.changes libqt4-devel-doc-data.spec qt-everywhere-opensource-src-4.7.2.tar.bz2 New: ---- qt-everywhere-opensource-src-4.7.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc.spec ++++++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.000000000 +0200 @@ -30,8 +30,8 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.7.2 -Release: 3 +Version: 4.7.3 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -86,7 +86,6 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff -Patch125: comodo-blacklisting.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -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 -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -103,11 +102,6 @@ handling. - -Authors: --------- - Qt Software - %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -145,7 +139,6 @@ %endif %patch123 %patch124 -%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them @@ -165,14 +158,18 @@ This package contains base tools, like string, xml, and network handling. +%package data +License: QPL, GPL +Group: System/Libraries +BuildArch: noarch +Summary: C++ Program Library, Core Components +Requires: %name = %version - -Authors: --------- - Troll Tech AS, Norway - +%description data +The architecture independent data files for the documentation. %build + %ifarch ppc64 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif @@ -216,6 +213,14 @@ ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser +# htmldocs are not generated - why? +for d in docimages qchdocs htmldocs ; do + make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d} +done + +# remove some executable flags from image files: +find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x + # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f @@ -233,8 +238,6 @@ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples -# packaged in %name-devel-doc-data -rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html} rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}* rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.* rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins @@ -276,4 +279,11 @@ /usr/bin/svgviewer /usr/bin/qt4-browser +%files data +%defattr(-,root,root,755) +%dir /usr/share/doc/packages/%base_name +/usr/share/doc/packages/%base_name/qch +/usr/share/doc/packages/%base_name/html* +/usr/share/doc/packages/%base_name/src + %changelog ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.000000000 +0200 @@ -28,8 +28,8 @@ %endif # COMMON-VERSION-BEGIN # COMMON-VERSION-BEGIN -Version: 4.7.2 -Release: 3 +Version: 4.7.3 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -78,7 +78,6 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff -Patch125: comodo-blacklisting.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -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 -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -95,11 +94,6 @@ handling. - -Authors: --------- - Qt Software - %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -137,7 +131,6 @@ %endif %patch123 %patch124 -%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.000000000 +0200 @@ -53,8 +53,8 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-VERSION-BEGIN -Version: 4.7.2 -Release: 3 +Version: 4.7.3 +Release: 1 %define base_name libqt4 %define x11_free -everywhere-opensource-src- %define rversion %version @@ -96,7 +96,6 @@ Patch121: webkit-sparc64.diff Patch123: use-cups-default-print-settings-bnc552218.diff Patch124: qtreeview-fix-QTBUG-16292.diff -Patch125: comodo-blacklisting.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %define common_options --opensource -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 -no-sql-mysql -importdir %plugindir/imports -xsync -xinput -gtkstyle @@ -113,11 +112,6 @@ handling. - -Authors: --------- - Qt Software - %prep %define plugindir %_libdir/qt4/plugins %setup -q -n qt%x11_free%rversion @@ -155,7 +149,6 @@ %endif %patch123 %patch124 -%patch125 # ### 47 rediff #%patch121 -p1 # be sure not to use them ++++++ libqt4-devel-doc.spec.in ++++++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:07.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:07.000000000 +0200 @@ -55,14 +55,18 @@ This package contains base tools, like string, xml, and network handling. +%package data +License: QPL, GPL +Group: System/Libraries +BuildArch: noarch +Summary: C++ Program Library, Core Components +Requires: %name = %version - -Authors: --------- - Troll Tech AS, Norway - +%description data +The architecture independent data files for the documentation. %build + %ifarch ppc64 export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" %endif @@ -106,6 +110,14 @@ ln -s %_bindir/svgviewer $RPM_BUILD_ROOT/%_libdir/qt4/examples/painting/svgviewer/svgviewer ln -s %_bindir/qt4-browser $RPM_BUILD_ROOT/%_libdir/qt4/demos/browser/browser +# htmldocs are not generated - why? +for d in docimages qchdocs htmldocs ; do + make INSTALL_ROOT=$RPM_BUILD_ROOT install_${d} +done + +# remove some executable flags from image files: +find $RPM_BUILD_ROOT/usr/share -name "*.png" -print0 | xargs -0 chmod a-x + # reduce fileconflicts for f in $(rpm -ql libqt4-devel) $(rpm -ql libqt4-x11) $(rpm -ql libqt4); do test -f $RPM_BUILD_ROOT/$f && rm $RPM_BUILD_ROOT/$f @@ -123,8 +135,6 @@ ln -s %_libdir/qt4/demos $RPM_BUILD_ROOT/%_docdir/%base_name/demos ln -s %_libdir/qt4/examples $RPM_BUILD_ROOT/%_docdir/%base_name/examples -# packaged in %name-devel-doc-data -rm -rf $RPM_BUILD_ROOT/%_docdir/%base_name/{doc,html} rm -f $RPM_BUILD_ROOT/%_libdir/libQt{3,A,C,G,H,N,S,T}* rm -f $RPM_BUILD_ROOT/%_libdir/libQtXml.* rm -rf $RPM_BUILD_ROOT/%_libdir/qt4/plugins @@ -143,8 +153,8 @@ %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 +%if %suse_version < 1110 + sed -i -e 's, supplements .*,,' $RPM_SOURCE_DIR/baselibs.conf %endif %files @@ -166,4 +176,12 @@ /usr/bin/svgviewer /usr/bin/qt4-browser +%files data +%defattr(-,root,root,755) +%dir /usr/share/doc/packages/%base_name +/usr/share/doc/packages/%base_name/qch +/usr/share/doc/packages/%base_name/html* +/usr/share/doc/packages/%base_name/src + + %changelog ++++++ pre_checkin.sh ++++++ --- /var/tmp/diff_new_pack.Qm9T6E/_old 2011-05-27 10:05:08.000000000 +0200 +++ /var/tmp/diff_new_pack.Qm9T6E/_new 2011-05-27 10:05:08.000000000 +0200 @@ -2,10 +2,9 @@ # This script is called automatically during autobuild checkin. ln -f libqt4.changes libqt4-sql-plugins.changes -ln -f libqt4.changes libqt4-devel-doc-data.changes ln -f libqt4.changes libqt4-devel-doc.changes -for spec in libqt4-sql-plugins.spec libqt4-devel-doc-data.spec libqt4-devel-doc.spec; do +for spec in libqt4-sql-plugins.spec libqt4-devel-doc.spec; do { sed -n -e '1,/COMMON-VERSION-BEGIN/p' $spec.in sed -n -e '/COMMON-VERSION-BEGIN/,/COMMON-VERSION-END/p' libqt4.spec sed -n -e '/COMMON-VERSION-END/,/COMMON-BEGIN/p' $spec.in ++++++ qt-everywhere-opensource-src-4.7.2.tar.bz2 -> qt-everywhere-opensource-src-4.7.3.tar.bz2 ++++++ libqt4/qt-everywhere-opensource-src-4.7.2.tar.bz2 /mounts/work_src_done/STABLE/libqt4/qt-everywhere-opensource-src-4.7.3.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
