February 2009 - openSUSE Commits - openSUSE Mailing Lists

commit kiwi for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Feb 6 16:06:19 CET 2009. -------- --- kiwi/kiwi.changes 2009-02-03 21:38:32.000000000 +0100 +++ kiwi/kiwi.changes 2009-02-05 17:17:10.892779000 +0100 @@ -1,0 +2,20 @@ +Thu Feb 5 14:00:29 CET 2009 - ms(a)suse.de + +- v3.13 +- fixed partition commands to always set an active (boot) + partition. This is required by some BIOS's (bnc #472218) +- fixed virtual disk size calculation: + * don't use du --apparent-size it's not the real size used + * setup a safe inode count to ensure all files fits in for ext2/3 +- fixed grub title setup, embed title string in a pair of + underscores which are not displayed by grub but avoid + menu title display problems + +------------------------------------------------------------------- +Wed Feb 4 14:25:15 CET 2009 - jcborn(a)suse.de + +- v3.12 +- added the -f option to mkisofs call in cd mastering script + (bnc #465820) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Ox6839/_old 2009-02-06 16:03:04.000000000 +0100 +++ /var/tmp/diff_new_pack.Ox6839/_new 2009-02-06 16:03:04.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 3.11) +# spec file for package kiwi (Version 3.13) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -50,7 +50,7 @@ Summary: OpenSuSE - KIWI Image System Provides: kiwi2 <= 2.14 Obsoletes: kiwi2 <= 2.14 -Version: 3.11 +Version: 3.13 Release: 1 Group: System/Management License: GPL v2 or later @@ -551,6 +551,20 @@ %endif %changelog +* Thu Feb 05 2009 ms(a)suse.de +- v3.13 +- fixed partition commands to always set an active (boot) + partition. This is required by some BIOS's (bnc #472218) +- fixed virtual disk size calculation: + * don't use du --apparent-size it's not the real size used + * setup a safe inode count to ensure all files fits in for ext2/3 +- fixed grub title setup, embed title string in a pair of + underscores which are not displayed by grub but avoid + menu title display problems +* Wed Feb 04 2009 jcborn(a)suse.de +- v3.12 +- added the -f option to mkisofs call in cd mastering script + (bnc #465820) * Tue Feb 03 2009 ms(a)suse.de - v3.11 - implemented support for ATA over Ethernet (bnc #441832) ++++++ kiwi.tar.bz2 ++++++ kiwi/kiwi.tar.bz2 kiwi/kiwi.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit aaa_base for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package aaa_base for openSUSE:Factory checked in at Fri Feb 6 16:02:54 CET 2009. -------- --- aaa_base/aaa_base.changes 2009-01-26 11:25:49.000000000 +0100 +++ aaa_base/aaa_base.changes 2009-02-06 14:25:21.732200898 +0100 @@ -1,0 +2,10 @@ +Fri Feb 6 14:24:36 CET 2009 - werner(a)suse.de + +- Enhance single user mode for shutdown (bnc#473043) + +------------------------------------------------------------------- +Wed Feb 4 17:39:52 CET 2009 - ro(a)suse.de + +- drop broken 0size file in man8 + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ aaa_base.spec ++++++ --- /var/tmp/diff_new_pack.R25909/_old 2009-02-06 15:53:11.000000000 +0100 +++ /var/tmp/diff_new_pack.R25909/_new 2009-02-06 15:53:11.000000000 +0100 @@ -28,7 +28,7 @@ PreReq: /usr/bin/sed /usr/bin/grep /bin/mv /bin/cat /bin/ls /bin/date /usr/bin/cmp /bin/fillup /sbin/insserv udev net-tools AutoReqProv: on Version: 11.2 -Release: 7 +Release: 8 Summary: SUSE Linux Base Package BuildRoot: %{_tmppath}/%{name}-%{version}-build Source: aaa_base.tar.bz2 @@ -139,6 +139,10 @@ %defattr(-,root,root) %changelog +* Fri Feb 06 2009 werner(a)suse.de +- Enhance single user mode for shutdown (bnc#473043) +* Wed Feb 04 2009 ro(a)suse.de +- drop broken 0size file in man8 * Mon Jan 26 2009 coolo(a)suse.de - removing the timeout, there is no good timeout value (bnc#426270) * Fri Jan 23 2009 coolo(a)suse.de ++++++ aaa_base.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/halt new/aaa_base/etc/init.d/halt --- old/aaa_base/etc/init.d/halt 2008-12-05 12:25:45.000000000 +0100 +++ new/aaa_base/etc/init.d/halt 2009-02-06 14:21:05.000000000 +0100 @@ -115,27 +115,26 @@ type -p startpar &> /dev/null || RUN_PARALLEL="no" startpar -v &> /dev/null || RUN_PARALLEL="no" -# -# set back system boot configuration -# -if test "$RUN_PARALLEL" = "yes" ; then - - startopt="-p4 -t 30 -T 3" - eval $(startpar $startopt -M halt) - unset failed_service skipped_service - -elif test -d /etc/init.d/boot.d/ ; then - +if test -z "$COLD_BOOT" ; then # - # call modules in boot.d via K* symlinks + # set back system boot configuration # + if test "$RUN_PARALLEL" = "yes" ; then - for link in /etc/init.d/boot.d/K[0-9][0-9]*; do - test -x $link || continue - $link stop - done - unset link - + startopt="-p4 -t 30 -T 3" + eval $(startpar $startopt -M halt) + unset failed_service skipped_service + + elif test -d /etc/init.d/boot.d/ ; then + # + # call modules in boot.d via K* symlinks + # + for link in /etc/init.d/boot.d/K[0-9][0-9]*; do + test -x $link || continue + $link stop + done + unset link + fi fi # check out if a software raid is active diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/aaa_base/etc/init.d/rc new/aaa_base/etc/init.d/rc --- old/aaa_base/etc/init.d/rc 2008-10-15 12:47:52.000000000 +0200 +++ new/aaa_base/etc/init.d/rc 2009-02-06 14:18:07.000000000 +0100 @@ -54,36 +54,56 @@ # Up from runlevel S we have to check if the system was # cold booted into single user mode and call /etc/init.d/boot. # -if test "$PREVLEVEL" = "S" -a "$RUNLEVEL" != "0" -a "$RUNLEVEL" != "6" ; then - # Double check - single="no" - hvname="yes" +if test "$PREVLEVEL" = "S" -a -n "$INIT_VERSION" ; then # - if rc_cmdline single s S ; then - single="yes" + # Check if this is a cold boot + # + COLD_BOOT=no + DTYPE=$(stat -f -c "%T" /proc 2>/dev/null) + if test "$DTYPE" != "proc" ; then + mount -n -t proc proc /proc + COLD_BOOT=yes + fi + DTYPE=$(stat -f -c "%T" /sys 2>/dev/null) + if test "$DTYPE" != "sysfs" ; then + mount -n -t sysfs sysfs /sys + COLD_BOOT=yes + fi + DTYPE=$(stat -f -c "%T" /dev/pts 2>/dev/null) + if test "$DTYPE" != "devpts" ; then + mount -n -t devpts -o mode=0620,gid=5 devpts /dev/pts + COLD_BOOT=yes fi read -t 2 hostname < /proc/sys/kernel/hostname 2> /dev/null case "${hostname}" in - "(none)"|unknown|"") hvname="no" ;; + "(none)"|unknown|"") COLD_BOOT=yes ;; esac unset hostname + export COLD_BOOT - if test "$single" = "yes" -a "$hvname" = "no" ; then - # This is the case if we're up from cold boot - echo "Sending all processes the TERM signal..." - killall5 -15 - sleep 3 - echo "Sending all processes the KILL signal..." - killall5 -9 - /etc/init.d/boot.swap stop nomtab - /etc/init.d/boot.localfs stop nomtab - /etc/init.d/boot - else - for b in /etc/init.d/boot.d/S*boot.udev - do - test -x $b || continue - $b start - done + # + # Changing from single user mode into runlevel mode + # For cold boot run all run boot otherwise start udev + # + if "$RUNLEVEL" != "0" -a "$RUNLEVEL" != "6" ; then + if test "$COLD_BOOT" = "yes" ; then + # This is the case if we're up from cold boot + echo "Sending all processes the TERM signal..." + killall5 -15 + sleep 3 + echo "Sending all processes the KILL signal..." + killall5 -9 + /etc/init.d/boot.swap stop nomtab + /etc/init.d/boot.localfs stop nomtab + /etc/init.d/boot + else + for b in /etc/init.d/boot.d/S*boot.udev + do + test -x $b || continue + $b start + done + fi + unset COLD_BOOT fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit build-compare for openSUSE:Factory
by root＠Hilbert.suse.de 06 Feb '09

06 Feb '09

Hello community, here is the log from the commit of package build-compare for openSUSE:Factory checked in at Fri Feb 6 15:22:33 CET 2009. -------- --- build-compare/build-compare.changes 2009-02-03 13:51:25.000000000 +0100 +++ build-compare/build-compare.changes 2009-02-06 14:29:35.409495000 +0100 @@ -1,0 +2,8 @@ +Thu Feb 5 17:34:29 CET 2009 - coolo(a)suse.de + +- fix 2 bugs +- don't ignore source rpms - changed sources should output + changed source rpms, no matter if they create the same binaries + (think of changed copyright header in spec files) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ build-compare.spec ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -24,7 +24,7 @@ AutoReqProv: on Summary: Build Result Compare Script Version: 2009.01.27 -Release: 2 +Release: 3 Source: same-build-result.sh Source1: rpm-check.sh Source2: COPYING @@ -54,6 +54,11 @@ /usr/lib/build %changelog +* Thu Feb 05 2009 coolo(a)suse.de +- fix 2 bugs +- don't ignore source rpms - changed sources should output + changed source rpms, no matter if they create the same binaries + (think of changed copyright header in spec files) * Tue Jan 27 2009 adrian(a)suse.de - Create initial package based on the work of Matz and Coolo This package provides script for the main build script to be able ++++++ rpm-check.sh ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -193,7 +193,7 @@ sed -i -e "s,new/,," $file2 if ! diff -u $file1 $file2 > $dfile; then echo "$file differs in assembler output" - head -n 2000 $dfile + head -n 200 $dfile ret=1 break fi @@ -213,7 +213,7 @@ *ASCII*|*text*) if ! cmp -s old/$file new/$file; then echo "$file differs ($ftype)" - diff -u old/$file1 new/$file2 | head -n 200 + diff -u old/$file new/$file | head -n 200 ret=1 break fi ++++++ same-build-result.sh ++++++ --- /var/tmp/diff_new_pack.Hp1282/_old 2009-02-06 15:22:09.000000000 +0100 +++ /var/tmp/diff_new_pack.Hp1282/_new 2009-02-06 15:22:09.000000000 +0100 @@ -26,16 +26,42 @@ exit 1 fi -#OLDRPMS=($(find "$OLDDIR" -name \*src.rpm|sort) $(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort)) -#NEWRPMS=($(find $NEWDIRS -name \*src.rpm|sort) $(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort)) -# Exclude src rpms for now: +if test `find $NEWDIRS -name *.rpm | wc -l` != `find $OLDDIR -name *.rpm | wc -l`; then + echo "different number of subpackages" + find $OLDDIR $NEWDIRS -name *.rpm + exit 1 +fi + +osrpm=$(find "$OLDDIR" -name \*src.rpm) +nsrpm=$(find $NEWDIRS -name \*src.rpm) + +if test ! -f "$osrpm"; then + echo no old source rpm in $OLDDIR + exit 1 +fi + +if test ! -f "$nsrpm"; then + echo no new source rpm in $NEWDIRS + exit 1 +fi + +echo "compare $osrpm $nsrpm" +bash $CMPSCRIPT "$osrpm" "$nsrpm" || exit 1 + OLDRPMS=($(find "$OLDDIR" -name \*rpm -a ! -name \*src.rpm|sort)) NEWRPMS=($(find $NEWDIRS -name \*rpm -a ! -name \*src.rpm|sort)) -for opac in "$OLDRPMS"; do +rpmqp="rpm -qp --qf --nodigest --nosignature %{NAME}" +for opac in ${OLDRPMS[*]}; do npac=${NEWRPMS[0]} NEWRPMS=(${NEWRPMS[@]:1}) # shift echo compare "$opac" "$npac" + oname=`$rpmqp $opac` + nname=`$rpmqp $npac` + if test "$oname" != "$nname"; then + echo "names differ: $oname $nname" + exit 1 + fi bash $CMPSCRIPT "$opac" "$npac" || exit 1 done ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit libqt4 for openSUSE:Factory
by root＠Hilbert.suse.de 05 Feb '09

05 Feb '09

Hello community, here is the log from the commit of package libqt4 for openSUSE:Factory checked in at Thu Feb 5 17:48:05 CET 2009. -------- --- libqt4/libqt4.changes 2009-01-27 23:13:45.000000000 +0100 +++ libqt4/libqt4.changes 2009-02-05 17:19:45.055206000 +0100 @@ -1,0 +2,7 @@ +Thu Feb 5 12:06:44 CET 2009 - dmueller(a)suse.de + +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) + +------------------------------------------------------------------- libqt4-devel-doc-data.changes: same change libqt4-sql-plugins.changes: same change libQtWebKit-devel.changes: same change calling whatdependson for head-i586 Old: ---- 0167-fix-group-reading.diff 0203-qtexthtmlparser-link-color.diff 0238-fix-qt-qttabbar-size.diff 0249-webkit-stale-frame-pointer.diff 0254-fix-qgraphicsproxywidget-deletion-crash.diff 0256-fix-recursive-backingstore-sync-crash.diff 0257-qurl-validate-speedup.diff 0260-fix-qgraphicswidget-deletionclearFocus.diff 0261-sync-before-reset-errorhandler.patch 0262-fix-treeview-animation-crash.diff 0263-fix-fontconfig-handling.diff 0264-fix-zero-height-qpixmap-isnull.diff 0265-fix-formlayoutcrash.diff lib64.patch postgresql83-support.diff ppc-atomic.diff qnativesocketengine-select.diff qt4-input-method-lazy-load.patch qt-x11-opensource-src-4.4.3.tar.bz2 statusbar-recursion.diff New: ---- ppc64-buildfix.diff qlibraryinfo-fixes.diff qt-x11-opensource-src-4.5.0-rc1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt4-devel-doc-data.spec ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-devel-doc-data (Version 4.4.3) +# spec file for package libqt4-devel-doc-data (Version 4.4.90+4.5.0rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: libqt4-devel-doc-data -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel libqt4-devel pkgconfig +BuildRequires: cups-devel freeglut-devel freetype2-devel libQtWebKit-devel libqt4-devel pkgconfig BuildRequires: libqt4-sql-sqlite openssl-devel sqlite-devel %if 0%{?suse_version} BuildRequires: update-desktop-files @@ -34,11 +34,11 @@ %requires_eq libqt4 # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.3 -Release: 11 +Version: 4.4.90+4.5.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.3 +%define rversion 4.5.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -49,50 +49,33 @@ Source16: linguist.png Patch2: qt-never-strip.diff Patch3: plastik-default.diff -Patch5: lib64.patch Patch6: use-freetype-default.diff Patch1006: use-freetype-default-legacy.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch27: 0167-fix-group-reading.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch48: 0203-qtexthtmlparser-link-color.diff Patch55: ignore-global-advance-width-in-fots.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch66: statusbar-recursion.diff -Patch67: postgresql83-support.diff Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch -Patch74: ppc-atomic.diff Patch75: qt-debug-timer.diff -Patch77: qt4-input-method-lazy-load.patch Patch79: aliasing.diff Patch82: 0234-fix-mysql-threaded.diff -Patch86: 0238-fix-qt-qttabbar-size.diff Patch87: qfatal-noreturn.diff Patch88: 0245-fix-randr-changes-detecting.diff Patch90: display-key-support.diff -Patch91: 0249-webkit-stale-frame-pointer.diff -Patch92: 0254-fix-qgraphicsproxywidget-deletion-crash.diff -Patch93: 0260-fix-qgraphicswidget-deletionclearFocus.diff -Patch94: qnativesocketengine-select.diff -Patch95: 0257-qurl-validate-speedup.diff -Patch97: 0256-fix-recursive-backingstore-sync-crash.diff -Patch98: 0262-fix-treeview-animation-crash.diff -Patch99: 0261-sync-before-reset-errorhandler.patch -Patch100: 0263-fix-fontconfig-handling.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch103: 0265-fix-formlayoutcrash.diff -Patch104: 0264-fix-zero-height-qpixmap-isnull.diff +Patch103: ppc64-buildfix.diff +Patch104: qlibraryinfo-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 + %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 %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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns + %define common_options -fast -no-separate-debug-info -shared -xkb -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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns %endif %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ @@ -116,7 +99,6 @@ %setup -q -n qt%x11_free%rversion %patch2 %patch3 -%patch5 %if %suse_version > 1010 %patch6 %else @@ -124,11 +106,9 @@ %endif # needs rediffing #%patch8 -%patch27 %patch39 %patch40 %patch43 -%patch48 %patch55 %patch60 %if %suse_version > 910 @@ -136,27 +116,13 @@ # %patch61 %endif %patch62 -%patch66 -%patch67 -p1 %patch70 -%patch74 %patch75 -%patch77 %patch79 %patch82 -%patch86 %patch87 %patch88 %patch90 -%patch91 -%patch92 -%patch93 -%patch94 -%patch95 -%patch97 -%patch98 -%patch99 -%patch100 %patch101 %patch102 %patch103 @@ -216,6 +182,10 @@ /usr/share/doc/packages/%base_name/src %changelog +* Thu Feb 05 2009 dmueller(a)suse.de +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) * Tue Jan 27 2009 dmueller(a)suse.de - drop 0258-windowsxpstyle-qbrush.diff, rejected upstream - fix qmake path separators ++++++ libqt4.spec ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4 (Version 4.4.3) +# spec file for package libqt4 (Version 4.4.90+4.5.0rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -46,11 +46,11 @@ Provides: libqt4-dbus-1 = 4.4.0 Obsoletes: libqt4-dbus-1 < 4.4.0 # COMMON-BEGIN -Version: 4.4.3 -Release: 11 +Version: 4.4.90+4.5.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.3 +%define rversion 4.5.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -61,50 +61,33 @@ Source16: linguist.png Patch2: qt-never-strip.diff Patch3: plastik-default.diff -Patch5: lib64.patch Patch6: use-freetype-default.diff Patch1006: use-freetype-default-legacy.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch27: 0167-fix-group-reading.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch48: 0203-qtexthtmlparser-link-color.diff Patch55: ignore-global-advance-width-in-fots.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch66: statusbar-recursion.diff -Patch67: postgresql83-support.diff Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch -Patch74: ppc-atomic.diff Patch75: qt-debug-timer.diff -Patch77: qt4-input-method-lazy-load.patch Patch79: aliasing.diff Patch82: 0234-fix-mysql-threaded.diff -Patch86: 0238-fix-qt-qttabbar-size.diff Patch87: qfatal-noreturn.diff Patch88: 0245-fix-randr-changes-detecting.diff Patch90: display-key-support.diff -Patch91: 0249-webkit-stale-frame-pointer.diff -Patch92: 0254-fix-qgraphicsproxywidget-deletion-crash.diff -Patch93: 0260-fix-qgraphicswidget-deletionclearFocus.diff -Patch94: qnativesocketengine-select.diff -Patch95: 0257-qurl-validate-speedup.diff -Patch97: 0256-fix-recursive-backingstore-sync-crash.diff -Patch98: 0262-fix-treeview-animation-crash.diff -Patch99: 0261-sync-before-reset-errorhandler.patch -Patch100: 0263-fix-fontconfig-handling.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch103: 0265-fix-formlayoutcrash.diff -Patch104: 0264-fix-zero-height-qpixmap-isnull.diff +Patch103: ppc64-buildfix.diff +Patch104: qlibraryinfo-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 + %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 %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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns + %define common_options -fast -no-separate-debug-info -shared -xkb -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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns %endif %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ @@ -129,7 +112,6 @@ %setup -q -n qt%x11_free%rversion %patch2 %patch3 -%patch5 %if %suse_version > 1010 %patch6 %else @@ -137,11 +119,9 @@ %endif # needs rediffing #%patch8 -%patch27 %patch39 %patch40 %patch43 -%patch48 %patch55 %patch60 %if %suse_version > 910 @@ -149,27 +129,13 @@ # %patch61 %endif %patch62 -%patch66 -%patch67 -p1 %patch70 -%patch74 %patch75 -%patch77 %patch79 %patch82 -%patch86 %patch87 %patch88 %patch90 -%patch91 -%patch92 -%patch93 -%patch94 -%patch95 -%patch97 -%patch98 -%patch99 -%patch100 %patch101 %patch102 %patch103 @@ -318,6 +284,9 @@ export QTDIR=$PWD export PATH=$PWD/bin:$PATH export LD_LIBRARY_PATH=$PWD/lib/ +%ifarch ppc64 + RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc" +%endif sed -i -e "/^QMAKE_CFLAGS_RELEASE[ \t]*+=/s,\$, $RPM_OPT_FLAGS," mkspecs/common/g++.conf export CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" export CFLAGS="$CFLAGS $RPM_OPT_FLAGS" @@ -397,8 +366,9 @@ %dir %plugindir/imageformats %dir %plugindir/inputmethods %dir %plugindir/accessible -%dir %_defaultdocdir/%name -%doc %_defaultdocdir/%name/changes-* +%dir %plugindir/graphicssystems +%dir /usr/share/qt4 +#%doc %_defaultdocdir/%name/changes-* %_libdir/libQtCore*.so.* %_libdir/libQtNetwork*.so.* %_libdir/libQtXml*.so.* @@ -429,6 +399,7 @@ %endif %_libdir/libQtSvg.so.* %_libdir/libQtScript.so.* +%_libdir/libQtScriptTools.so.* %_libdir/libQtDesigner*.so.* %_libdir/libQtAssistantClient.so.* %_libdir/libQtHelp.so.* @@ -437,6 +408,7 @@ %plugindir/imageformats/* %plugindir/inputmethods/* %plugindir/accessible/* +%plugindir/graphicssystems/* /usr/share/qt4/translations /usr/share/qt4/phrasebooks %if %suse_version > 910 @@ -463,6 +435,7 @@ /usr/bin/linguist /usr/bin/lrelease /usr/bin/lupdate +/usr/bin/lconvert /usr/bin/pixeltool /usr/bin/qt3to4 %if %suse_version > 910 @@ -492,6 +465,7 @@ /usr/include/QtOpenGL %endif /usr/include/QtScript +/usr/include/QtScriptTools /usr/include/QtSql /usr/include/QtSvg /usr/include/QtTest @@ -519,6 +493,10 @@ %plugindir/sqldrivers/libqsqlite*.so %changelog +* Thu Feb 05 2009 dmueller(a)suse.de +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) * Tue Jan 27 2009 dmueller(a)suse.de - drop 0258-windowsxpstyle-qbrush.diff, rejected upstream - fix qmake path separators ++++++ libqt4-sql-plugins.spec ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libqt4-sql-plugins (Version 4.4.3) +# spec file for package libqt4-sql-plugins (Version 4.4.90+4.5.0rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -33,11 +33,11 @@ Summary: Qt 4 SQL-Related Libraries # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.3 -Release: 11 +Version: 4.4.90+4.5.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.3 +%define rversion 4.5.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -48,50 +48,33 @@ Source16: linguist.png Patch2: qt-never-strip.diff Patch3: plastik-default.diff -Patch5: lib64.patch Patch6: use-freetype-default.diff Patch1006: use-freetype-default-legacy.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch27: 0167-fix-group-reading.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch48: 0203-qtexthtmlparser-link-color.diff Patch55: ignore-global-advance-width-in-fots.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch66: statusbar-recursion.diff -Patch67: postgresql83-support.diff Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch -Patch74: ppc-atomic.diff Patch75: qt-debug-timer.diff -Patch77: qt4-input-method-lazy-load.patch Patch79: aliasing.diff Patch82: 0234-fix-mysql-threaded.diff -Patch86: 0238-fix-qt-qttabbar-size.diff Patch87: qfatal-noreturn.diff Patch88: 0245-fix-randr-changes-detecting.diff Patch90: display-key-support.diff -Patch91: 0249-webkit-stale-frame-pointer.diff -Patch92: 0254-fix-qgraphicsproxywidget-deletion-crash.diff -Patch93: 0260-fix-qgraphicswidget-deletionclearFocus.diff -Patch94: qnativesocketengine-select.diff -Patch95: 0257-qurl-validate-speedup.diff -Patch97: 0256-fix-recursive-backingstore-sync-crash.diff -Patch98: 0262-fix-treeview-animation-crash.diff -Patch99: 0261-sync-before-reset-errorhandler.patch -Patch100: 0263-fix-fontconfig-handling.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch103: 0265-fix-formlayoutcrash.diff -Patch104: 0264-fix-zero-height-qpixmap-isnull.diff +Patch103: ppc64-buildfix.diff +Patch104: qlibraryinfo-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 + %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 %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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns + %define common_options -fast -no-separate-debug-info -shared -xkb -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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns %endif %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ @@ -114,7 +97,6 @@ %setup -q -n qt%x11_free%rversion %patch2 %patch3 -%patch5 %if %suse_version > 1010 %patch6 %else @@ -122,11 +104,9 @@ %endif # needs rediffing #%patch8 -%patch27 %patch39 %patch40 %patch43 -%patch48 %patch55 %patch60 %if %suse_version > 910 @@ -134,27 +114,13 @@ # %patch61 %endif %patch62 -%patch66 -%patch67 -p1 %patch70 -%patch74 %patch75 -%patch77 %patch79 %patch82 -%patch86 %patch87 %patch88 %patch90 -%patch91 -%patch92 -%patch93 -%patch94 -%patch95 -%patch97 -%patch98 -%patch99 -%patch100 %patch101 %patch102 %patch103 @@ -276,6 +242,10 @@ %plugindir/sqldrivers/libqsqlmysql*.so %changelog +* Thu Feb 05 2009 dmueller(a)suse.de +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) * Tue Jan 27 2009 dmueller(a)suse.de - drop 0258-windowsxpstyle-qbrush.diff, rejected upstream - fix qmake path separators ++++++ libQtWebKit-devel.spec ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:43.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libQtWebKit-devel (Version 4.4.3) +# spec file for package libQtWebKit-devel (Version 4.4.90+4.5.0rc1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -37,11 +37,11 @@ %requires_eq libqt4-devel # COMMON-BEGIN # COMMON-BEGIN -Version: 4.4.3 -Release: 11 +Version: 4.4.90+4.5.0rc1 +Release: 1 %define base_name libqt4 %define x11_free -x11-opensource-src- -%define rversion 4.4.3 +%define rversion 4.5.0-rc1 Source: qt%x11_free%rversion.tar.bz2 Source10: qt4config.desktop Source11: designer4.desktop @@ -52,50 +52,33 @@ Source16: linguist.png Patch2: qt-never-strip.diff Patch3: plastik-default.diff -Patch5: lib64.patch Patch6: use-freetype-default.diff Patch1006: use-freetype-default-legacy.diff Patch8: link-tools-shared.diff Patch20: qt-font-choose.diff -Patch27: 0167-fix-group-reading.diff Patch39: 0191-listview-alternate-row-colors.diff Patch40: 0188-fix-moc-parser-same-name-header.diff Patch43: 0195-compositing-properties.diff -Patch48: 0203-qtexthtmlparser-link-color.diff Patch55: ignore-global-advance-width-in-fots.diff Patch60: 0180-window-role.diff Patch61: qt4-fake-bold.patch Patch62: qdbus-enable-on-sles10.diff -Patch66: statusbar-recursion.diff -Patch67: postgresql83-support.diff Patch70: 0225-invalidate-tabbar-geometry-on-refresh.patch -Patch74: ppc-atomic.diff Patch75: qt-debug-timer.diff -Patch77: qt4-input-method-lazy-load.patch Patch79: aliasing.diff Patch82: 0234-fix-mysql-threaded.diff -Patch86: 0238-fix-qt-qttabbar-size.diff Patch87: qfatal-noreturn.diff Patch88: 0245-fix-randr-changes-detecting.diff Patch90: display-key-support.diff -Patch91: 0249-webkit-stale-frame-pointer.diff -Patch92: 0254-fix-qgraphicsproxywidget-deletion-crash.diff -Patch93: 0260-fix-qgraphicswidget-deletionclearFocus.diff -Patch94: qnativesocketengine-select.diff -Patch95: 0257-qurl-validate-speedup.diff -Patch97: 0256-fix-recursive-backingstore-sync-crash.diff -Patch98: 0262-fix-treeview-animation-crash.diff -Patch99: 0261-sync-before-reset-errorhandler.patch -Patch100: 0263-fix-fontconfig-handling.diff Patch101: no-moc-date.diff Patch102: 0253-qmake_correct_path_separators.diff -Patch103: 0265-fix-formlayoutcrash.diff -Patch104: 0264-fix-zero-height-qpixmap-isnull.diff +Patch103: ppc64-buildfix.diff +Patch104: qlibraryinfo-fixes.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %if %suse_version > 910 - %define common_options -fast -no-separate-debug-info -shared -xkb -tablet -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 + %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 %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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns + %define common_options -fast -no-separate-debug-info -shared -xkb -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 %_libdir/qt4/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 -no-webkit -no-xmlpatterns %endif %define check_config \ grep '# define' src/corelib/global/qconfig.h | egrep -v 'QT_(ARCH|USE)'; \ @@ -120,7 +103,6 @@ %setup -q -n qt%x11_free%rversion %patch2 %patch3 -%patch5 %if %suse_version > 1010 %patch6 %else @@ -128,11 +110,9 @@ %endif # needs rediffing #%patch8 -%patch27 %patch39 %patch40 %patch43 -%patch48 %patch55 %patch60 %if %suse_version > 910 @@ -140,27 +120,13 @@ # %patch61 %endif %patch62 -%patch66 -%patch67 -p1 %patch70 -%patch74 %patch75 -%patch77 %patch79 %patch82 -%patch86 %patch87 %patch88 %patch90 -%patch91 -%patch92 -%patch93 -%patch94 -%patch95 -%patch97 -%patch98 -%patch99 -%patch100 %patch101 %patch102 %patch103 @@ -333,6 +299,10 @@ /usr/bin/qt4-browser %changelog +* Thu Feb 05 2009 dmueller(a)suse.de +- update to 4.5.0 RC1: + * for detaled changelog, see included changes-4.5.0 + * add missing libqt4-sql-sqlite baselib (bnc#472311) * Tue Jan 27 2009 dmueller(a)suse.de - drop 0258-windowsxpstyle-qbrush.diff, rejected upstream - fix qmake path separators ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:43.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:43.000000000 +0100 @@ -5,6 +5,9 @@ libqt4-qt3support libqt4-sql +libqt4-sql-sqlite + supplements "packageand(libqt4-sql-sqlite:libqt4-sql-<targettype>)" + libqt4-sql-unixODBC supplements "packageand(libqt4-sql-unixODBC:libqt4-sql-<targettype>)" ++++++ ignore-global-advance-width-in-fots.diff ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:44.000000000 +0100 @@ -1,11 +1,11 @@ --- src/gui/text/qfontengine_ft.cpp +++ src/gui/text/qfontengine_ft.cpp -@@ -507,7 +507,7 @@ +@@ -601,7 +601,7 @@ QFontEngineFT::QFontEngineFT(const QFontDef &fd) kerning_pairs_loaded = false; transform = false; antialias = true; - default_load_flags = 0; + default_load_flags = FT_LOAD_IGNORE_GLOBAL_ADVANCE_WIDTH; + default_hint_style = HintNone; subpixelType = Subpixel_None; - defaultGlyphFormat = Format_None; - canUploadGlyphsToServer = false; + lcdFilterType = 0; ++++++ libqt4-devel-doc-data.spec.in ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:44.000000000 +0100 @@ -12,7 +12,7 @@ # nodebuginfo Name: libqt4-devel-doc-data -BuildRequires: cups-devel freeglut-devel freetype2-devel gcc-c++ libjpeg-devel libpng-devel pkgconfig libqt4-devel +BuildRequires: cups-devel freeglut-devel freetype2-devel pkgconfig libqt4-devel libQtWebKit-devel BuildRequires: openssl-devel sqlite-devel libqt4-sql-sqlite %if 0%{?suse_version} BuildRequires: update-desktop-files ++++++ ppc64-buildfix.diff ++++++ --- src/corelib/arch/qatomic_powerpc.h +++ src/corelib/arch/qatomic_powerpc.h @@ -188,7 +188,7 @@ inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) "lwarx %[result]," _Q_VALUE "\n" "xor. %[result], %[result], %[expectedValue]\n" "bne $+12\n" - "stwcx. %[newValue],0,%[_q_value]\n" + "stwcx. %[newValue]," _Q_VALUE "\n" "bne- $-16\n" : [result] "=&r" (result), _Q_VALUE_MEMORY_OPERAND ++++++ qlibraryinfo-fixes.diff ++++++ --- src/corelib/global/qlibraryinfo.cpp +++ src/corelib/global/qlibraryinfo.cpp @@ -494,64 +494,9 @@ extern "C" { void qt_core_init_boilerplate() __attribute__((noreturn)); } -# if defined(QT_ARCH_I386) #define sysinit() (void)0 -#define syswrite(msg, len) \ - ({ int res; \ - asm volatile ("movl %%ebx, %%edi\n" \ - "movl $1, %%ebx\n" \ - "int $0x80\n" \ - "movl %%edi, %%ebx\n" \ - : "=a" (res) : "0" (SYS_write), "c" (msg), "d" (len) : "edi"); res; }) -#define sysexit(c) \ - asm ("xor %%ebx, %%ebx\n" \ - "int $0x80\n" \ - : : "a" (SYS_exit)); _exit(c) - -# elif defined(QT_ARCH_X86_64) -#define sysinit() (void)0 -#define syswrite(msg, len) \ - ({ int res; \ - asm volatile ("syscall\n" \ - : "=a" (res) : "0" (SYS_write), "D" (1), "S" (msg), "d" (len) : "rcx"); res; }) -#define sysexit(c) \ - asm ("syscall\n" \ - : : "a" (SYS_exit), "D" (0)); _exit(c) - -# elif defined(QT_ARCH_IA64) -#define sysinit() \ - asm volatile ("{.mlx\n" \ - " nop.m 0\n" \ - " movl r2 = @pcrel(boilerplate);;" \ - "}\n" \ - "{.mii\n" \ - " mov r10 = @ltoffx(boilerplate)\n" \ - " mov r1 = ip\n" \ - " adds r2 = -16, r2\n;;\n" \ - "}\n" \ - " add r1 = r2, r1;;\n" \ - " sub r1 = r1, r10;;\n" \ - : : : "r2", "r10") -#define syswrite(msg, len) \ - ({ const char *_msg = msg; \ - asm ("mov out0=%1\n" \ - "mov out1=%2\n" \ - "mov out2=%3\n" \ - ";;\n" \ - "mov r15=%0\n" \ - "break 0x100000;;\n" \ - : : "I" (SYS_write), "I" (1), "r" (_msg), "r" (len)); }) -#define sysexit(c) \ - asm ("mov out0=%1\n" \ - ";;\n" \ - "mov r15=%0\n" \ - "break 0x100000;;\n" \ - : : "I" (SYS_exit), "O" (0)); write(1, 0, 0); _exit(c) -# else -#define sysinit() (void)0 -#define syswrite(msg, len) (msg); (len) +#define syswrite(msg, len) syscall(SYS_write, msg, len); #define sysexit(c) __builtin_exit(c) -# endif #define sysputs(msg) syswrite(msg, -1 + sizeof(msg)) #define sysendl() syswrite("\n", 1) ++++++ use-freetype-default.diff ++++++ --- /var/tmp/diff_new_pack.iH1658/_old 2009-02-05 17:24:44.000000000 +0100 +++ /var/tmp/diff_new_pack.iH1658/_new 2009-02-05 17:24:44.000000000 +0100 @@ -1,7 +1,7 @@ --- src/gui/text/qfontengine_x11.cpp +++ src/gui/text/qfontengine_x11.cpp -@@ -890,6 +890,27 @@ Q_GUI_EXPORT void qt_x11ft_convert_patte - *antialias = b; +@@ -992,6 +992,26 @@ static bool subpixel_rendering_available() + return (implemented = true); } +#include <ft2build.h> @@ -24,17 +24,15 @@ + + return (implemented = true); +} -+ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int screen) : QFontEngineFT(fd) -@@ -907,7 +928,8 @@ QFontEngineX11FT::QFontEngineX11FT(FcPat +@@ -1009,7 +1029,7 @@ QFontEngineX11FT::QFontEngineX11FT(FcPattern *pattern, const QFontDef &fd, int s canUploadGlyphsToServer = qApp->thread() == QThread::currentThread(); subpixelType = Subpixel_None; - if (antialias) { -+ + if (subpixel_rendering_available() && antialias) { - int subpixel = 0; - if (FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel) == FcResultNoMatch - && X11->display) + int subpixel = X11->display ? X11->screens[screen].subpixel : FC_RGBA_UNKNOWN; + if (subpixel == FC_RGBA_UNKNOWN) + (void) FcPatternGetInteger(pattern, FC_RGBA, 0, &subpixel); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit wine for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '09

04 Feb '09

Hello community, here is the log from the commit of package wine for openSUSE:Factory checked in at Wed Feb 4 01:03:52 CET 2009. -------- --- wine/wine.changes 2009-01-18 23:13:40.000000000 +0100 +++ wine/wine.changes 2009-02-03 17:50:59.000000000 +0100 @@ -1,0 +2,12 @@ +Tue Feb 3 17:50:35 CET 2009 - meissner(a)suse.de + +- Updated to upstream 1.1.14 + - Various bug fixes for Internet Explorer 7. + - Many crypt32 improvements, including new export wizard. + - Better support for windowless Richedit. + - Improvements to the print dialog. + - Many fixes to the regression tests on Windows. + - Various bug fixes. +- Updated winetricks + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- wine-1.1.13.tar.bz2 New: ---- wine-1.1.14.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ wine.spec ++++++ --- /var/tmp/diff_new_pack.W16578/_old 2009-02-04 01:03:21.000000000 +0100 +++ /var/tmp/diff_new_pack.W16578/_new 2009-02-04 01:03:21.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package wine (Version 1.1.13) +# spec file for package wine (Version 1.1.14) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ License: LGPL v2.1 or later Group: System/Emulators/PC AutoReqProv: on -Version: 1.1.13 +Version: 1.1.14 Release: 1 Summary: An MS Windows Emulator Url: http://www.winehq.com @@ -125,6 +125,15 @@ /usr/share/aclocal/wine.m4 %changelog +* Tue Feb 03 2009 meissner(a)suse.de +- Updated to upstream 1.1.14 + - Various bug fixes for Internet Explorer 7. + - Many crypt32 improvements, including new export wizard. + - Better support for windowless Richedit. + - Improvements to the print dialog. + - Many fixes to the regression tests on Windows. + - Various bug fixes. +- Updated winetricks * Sun Jan 18 2009 meissner(a)suse.de - Updated to upstream 1.1.13 - Freedesktop.org-compliant startup notifications. ++++++ wine-1.1.13.tar.bz2 -> wine-1.1.14.tar.bz2 ++++++ wine/wine-1.1.13.tar.bz2 wine/wine-1.1.14.tar.bz2 differ: byte 11, line 1 ++++++ winetricks ++++++ ++++ 1033 lines (skipped) ++++ between wine/winetricks ++++ and wine/winetricks ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-restore for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '09

04 Feb '09

Hello community, here is the log from the commit of package yast2-restore for openSUSE:Factory checked in at Wed Feb 4 01:02:36 CET 2009. -------- --- yast2-restore/yast2-restore.changes 2008-12-16 15:46:47.000000000 +0100 +++ yast2-restore/yast2-restore.changes 2009-01-29 19:35:34.000000000 +0100 @@ -1,0 +2,7 @@ +Thu Jan 29 19:21:35 CET 2009 - locilka(a)suse.cz + +- Fixed displaying i18n characters in summary (bnc #460674). +- Save summary to file - huge speedup (bnc #460674). +- 2.18.0 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-restore-2.17.0.tar.bz2 New: ---- yast2-restore-2.18.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-restore.spec ++++++ --- /var/tmp/diff_new_pack.QN4866/_old 2009-02-04 01:01:33.000000000 +0100 +++ /var/tmp/diff_new_pack.QN4866/_new 2009-02-04 01:01:33.000000000 +0100 @@ -1,7 +1,7 @@ # -# spec file for package yast2-restore (Version 2.17.0) +# spec file for package yast2-restore (Version 2.18.0) # -# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -19,12 +19,12 @@ Name: yast2-restore -Version: 2.17.0 +Version: 2.18.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-restore-2.17.0.tar.bz2 +Source0: yast2-restore-2.18.0.tar.bz2 Prefix: /usr BuildRequires: perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-testsuite Requires: aaa_base @@ -47,7 +47,7 @@ Ladislav Slezak <lslezak(a)suse.cz> %prep -%setup -n yast2-restore-2.17.0 +%setup -n yast2-restore-2.18.0 %build %{prefix}/bin/y2tool y2autoconf @@ -82,6 +82,10 @@ %{prefix}/lib/YaST2/bin/restore_parse_pkginfo.pl %doc %{prefix}/share/doc/packages/yast2-restore %changelog +* Thu Jan 29 2009 locilka(a)suse.cz +- Fixed displaying i18n characters in summary (bnc #460674). +- Save summary to file - huge speedup (bnc #460674). +- 2.18.0 * Tue Dec 16 2008 locilka(a)suse.cz - Fixed alignment of buttons (bnc #447102). - 2.17.0 ++++++ yast2-restore-2.17.0.tar.bz2 -> yast2-restore-2.18.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/configure new/yast2-restore-2.18.0/configure --- old/yast2-restore-2.17.0/configure 2008-12-16 15:30:03.000000000 +0100 +++ new/yast2-restore-2.18.0/configure 2009-01-30 16:19:39.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-restore 2.16.2. +# Generated by GNU Autoconf 2.63 for yast2-restore 2.18.0. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-restore' PACKAGE_TARNAME='yast2-restore' -PACKAGE_VERSION='2.16.2' -PACKAGE_STRING='yast2-restore 2.16.2' +PACKAGE_VERSION='2.18.0' +PACKAGE_STRING='yast2-restore 2.18.0' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-restore 2.16.2 to adapt to many kinds of systems. +\`configure' configures yast2-restore 2.18.0 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-restore 2.16.2:";; + short | recursive ) echo "Configuration of yast2-restore 2.18.0:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-restore configure 2.16.2 +yast2-restore configure 2.18.0 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-restore $as_me 2.16.2, which was +It was created by yast2-restore $as_me 2.18.0, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-restore' - VERSION='2.16.2' + VERSION='2.18.0' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.16.2" +VERSION="2.18.0" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-restore $as_me 2.16.2, which was +This file was extended by yast2-restore $as_me 2.18.0, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-restore config.status 2.16.2 +yast2-restore config.status 2.18.0 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/configure.in new/yast2-restore-2.18.0/configure.in --- old/yast2-restore-2.17.0/configure.in 2008-12-16 15:29:58.000000000 +0100 +++ new/yast2-restore-2.18.0/configure.in 2009-01-30 16:19:36.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-restore, 2.16.2, http://bugs.opensuse.org/, yast2-restore) +AC_INIT(yast2-restore, 2.18.0, http://bugs.opensuse.org/, yast2-restore) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.16.2" +VERSION="2.18.0" RPMNAME="yast2-restore" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/src/Restore.ycp new/yast2-restore-2.18.0/src/Restore.ycp --- old/yast2-restore-2.17.0/src/Restore.ycp 2008-12-15 14:12:41.000000000 +0100 +++ new/yast2-restore-2.18.0/src/Restore.ycp 2009-01-29 19:36:11.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: Restore.ycp 41703 2007-11-01 13:56:53Z locilka $ + * $Id: Restore.ycp 55155 2009-01-29 18:36:15Z locilka $ * Representation of the configuration of restore. * Input and output routines. @@ -972,7 +972,7 @@ infofiles = infofiles + (compressed_packages_info ? "info/packages_info.gz" : "info/packages_info"); // unpack info files - result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C " + tempdir + " -x -f " + filename + " " + infofiles + " 2> /dev/null"); + result = (map) SCR::Execute(.target.bash_output, "/bin/tar -C '" + String::Quote (tempdir) + "' -x -f " + filename + " " + infofiles + " 2> /dev/null"); date = (string) SCR::Read(.target.string, tempdir + "/info/date"); comment = (string) SCR::Read(.target.string, tempdir + "/info/comment"); @@ -1460,6 +1460,10 @@ } ); + // BNC #460674, Do not change the system locale + // It can change I18N characters in output + string locale_modifications = "export LANG=C; "; + if (fileinarchive == "") { y2error("Can't find subarchive for package %1", package); @@ -1478,14 +1482,14 @@ } ); - string command = "export LC_ALL=C; echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; + string command = locale_modifications + "echo q | /bin/tar -C " + tempdir + " -x -M " + param + fileinarchive + " 2> /dev/null"; y2debug("Running command: %1", command); started = (boolean) SCR::Execute(.background.run, command); } else { - started = (boolean) SCR::Execute(.background.run, "export LC_ALL=C; /bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); + started = (boolean) SCR::Execute(.background.run, locale_modifications + "/bin/tar -C " + tempdir + " -x -f " + filename + " " + fileinarchive); } // abort test cycle @@ -1563,11 +1567,11 @@ // for tar: --files-from=filename // create (s)tar command - string tarcommand = (star == false) ? ("export LC_ALL=C; /bin/tar -C " + targetdir + " " + string tarcommand = (star == false) ? (locale_modifications + "/bin/tar -C " + targetdir + " " + compress + " -x -v -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout") - : ("export LC_ALL=C; /usr/bin/star -C " + targetdir + " " + : (locale_modifications + "/usr/bin/star -C " + targetdir + " " + compress + " -x -v -U -f " + tempdir + "/" + fileinarchive + " " + RPMdb + " " + unpackfiles + " 2> " + tempdir + "/tar.stderr > " + tempdir + "/tar.stdout"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/src/summary_dialog.ycp new/yast2-restore-2.18.0/src/summary_dialog.ycp --- old/yast2-restore-2.17.0/src/summary_dialog.ycp 2008-12-15 14:12:41.000000000 +0100 +++ new/yast2-restore-2.18.0/src/summary_dialog.ycp 2009-01-30 15:23:25.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: summary_dialog.ycp 24002 2005-07-12 10:10:31Z locilka $ + * $Id: summary_dialog.ycp 55169 2009-01-30 14:23:28Z locilka $ * * Display summary dialog in wizard with optional details. Summary can be saved to file. * @@ -25,6 +25,8 @@ import "Popup"; import "Label"; +import "Directory"; +import "String"; /** * This function removes HTML tags from input string @@ -32,8 +34,7 @@ * @return string String without tags */ -define string RemoveTags(string input) ``{ - string ret = input; +define string RemoveTags(string & ret) ``{ map<string,string> tagmapping = $[ "BR" : "\n", "/P" : "\n", "P" : "", "B" : "", "/B" : "", "EM" : "", "/EM" : "", "I" : "", "/I" : "", "TT" : "", "/TT" : "", @@ -42,17 +43,22 @@ "H3" : "", "/H3" : "" ]; + string tag = nil; + string taglower = nil; + foreach(string t, string repl, tagmapping, ``{ - string tag = "<" + t + ">"; + tag = "<" + t + ">"; while (issubstring(ret, tag)) { ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); } - while (issubstring(ret, tolower(tag))) + taglower = tolower(tag); + + while (issubstring(ret, taglower)) { - ret = regexpsub(ret, "(.*)" + tag + "(.*)", "\\1" + repl + "\\2"); + ret = regexpsub(ret, "(.*)" + taglower + "(.*)", "\\1" + repl + "\\2"); } } ); @@ -120,7 +126,35 @@ if (savefile != "" && savefile != nil) { - SCR::Write(.target.string, savefile, RemoveTags(detail_text)); + // Create or empty the file + SCR::Write(.target.string, savefile, ""); + + // BNC #460674 + // Due to the very ineffective all-in-one-run function, removing HTML + // and writing thw whole file at once takes just too much time + // + // Fixed by going through the summary line by line (by <BR>s) + + string tmpfile = Directory::tmpdir + "/restore_tmpfile"; + + y2milestone ("Using tmpfile: %1", tmpfile); + // Using tmpfile - there are more powerful tools for parsing text + if (SCR::Write (.target.string, tmpfile, detail_text)) { + if ((integer) SCR::Execute ( + .target.bash, + sformat ("perl -pi -e \"s/<BR>/\\n\/g;\" '%1'", String::Quote (tmpfile)) + ) == 0) { + detail_text = (string) SCR::Read (.target.string, tmpfile); + } + } + + foreach (string one_line, splitstring (detail_text, "\n"), { + // <BR> == newline + one_line = one_line + "\n"; + // Appending lines one by one + SCR::Write (.backup.file_append, [savefile, RemoveTags (one_line)]); + }); + y2milestone("Summary saved to file: %1", savefile); } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/src/ui.ycp new/yast2-restore-2.18.0/src/ui.ycp --- old/yast2-restore-2.17.0/src/ui.ycp 2008-12-16 15:47:41.000000000 +0100 +++ new/yast2-restore-2.18.0/src/ui.ycp 2008-12-16 15:47:32.000000000 +0100 @@ -11,7 +11,7 @@ * Authors: * Ladislav Slezak <lslezak(a)suse.cz> * - * $Id: ui.ycp 54187 2008-12-16 14:47:41Z locilka $ + * $Id: ui.ycp 54186 2008-12-16 14:47:33Z locilka $ * * All user interface functions. * diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-restore-2.17.0/VERSION new/yast2-restore-2.18.0/VERSION --- old/yast2-restore-2.17.0/VERSION 2008-12-16 15:42:34.000000000 +0100 +++ new/yast2-restore-2.18.0/VERSION 2009-01-29 19:36:04.000000000 +0100 @@ -1 +1 @@ -2.17.0 +2.18.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-ldap-client for openSUSE:Factory
by root＠Hilbert.suse.de 04 Feb '09

04 Feb '09

Hello community, here is the log from the commit of package yast2-ldap-client for openSUSE:Factory checked in at Wed Feb 4 01:01:25 CET 2009. -------- --- yast2-ldap-client/yast2-ldap-client.changes 2009-01-08 15:06:57.000000000 +0100 +++ yast2-ldap-client/yast2-ldap-client.changes 2009-02-03 15:43:55.936739000 +0100 @@ -2 +2,18 @@ -Thu Jan 8 14:55:20 CET 2009 - jsuchome(a)suse.cz +Tue Feb 3 15:37:38 CET 2009 - jsuchome(a)suse.cz + +- do not require entering data when disabling LDAP (bnc#471852) +- 2.18.0 + +------------------------------------------------------------------- +Thu Jan 15 14:45:54 CET 2009 - jsuchome(a)suse.cz + +- show port in the server field, read the data if there were + not read yet (patch from L3 team, bnc#464203) + +------------------------------------------------------------------- +Wed Jan 14 15:38:41 CET 2009 - jsuchome(a)suse.cz + +- no exit confirmation popup if no changes were made (bnc#460161) + +------------------------------------------------------------------- +Thu Jan 8 14:53:11 CET 2009 - jsuchome(a)suse.cz @@ -7 +23,0 @@ -- 2.17.19 calling whatdependson for head-i586 Old: ---- yast2-ldap-client-2.17.19.tar.bz2 New: ---- yast2-ldap-client-2.18.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-client.spec ++++++ --- /var/tmp/diff_new_pack.G16220/_old 2009-02-04 00:57:50.000000000 +0100 +++ /var/tmp/diff_new_pack.G16220/_new 2009-02-04 00:57:50.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-ldap-client (Version 2.17.19) +# spec file for package yast2-ldap-client (Version 2.18.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-ldap-client -Version: 2.17.19 +Version: 2.18.0 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-client-2.17.19.tar.bz2 +Source0: yast2-ldap-client-2.18.0.tar.bz2 Prefix: /usr BuildRequires: doxygen perl-XML-Writer update-desktop-files yast2 yast2-devtools yast2-network yast2-pam yast2-testsuite PreReq: %fillup_prereq @@ -54,7 +54,7 @@ Jiri Suchomel <jsuchome(a)suse.cz> %prep -%setup -n yast2-ldap-client-2.17.19 +%setup -n yast2-ldap-client-2.18.0 %build %{prefix}/bin/y2tool y2autoconf @@ -94,11 +94,18 @@ %doc %{prefix}/share/doc/packages/yast2-ldap-client /var/adm/fillup-templates/sysconfig.ldap %changelog +* Tue Feb 03 2009 jsuchome(a)suse.cz +- do not require entering data when disabling LDAP (bnc#471852) +- 2.18.0 +* Thu Jan 15 2009 jsuchome(a)suse.cz +- show port in the server field, read the data if there were + not read yet (patch from L3 team, bnc#464203) +* Wed Jan 14 2009 jsuchome(a)suse.cz +- no exit confirmation popup if no changes were made (bnc#460161) * Thu Jan 08 2009 jsuchome(a)suse.cz - do not require double clicking in LDAP Browser tree (bnc#464144) - disable renaming of the LDAP objects and modification of objectClass attribute in the LDAP Browser (bnc#464148) -- 2.17.19 * Fri Dec 12 2008 jsuchome(a)suse.cz - really use 'exop' as default value for pam_password (bnc#458363) - 2.17.18 ++++++ yast2-ldap-client-2.17.19.tar.bz2 -> yast2-ldap-client-2.18.0.tar.bz2 ++++++ ++++ 2375 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.17.19/configure.in new/yast2-ldap-client-2.18.0/configure.in --- old/yast2-ldap-client-2.17.19/configure.in 2009-01-08 14:56:15.000000000 +0100 +++ new/yast2-ldap-client-2.18.0/configure.in 2008-04-15 10:01:28.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.16.8 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ldap-client, 2.17.19, http://bugs.opensuse.org/, yast2-ldap-client) +AC_INIT(yast2-ldap-client, 2.16.12, http://bugs.opensuse.org/, yast2-ldap-client) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.19" +VERSION="2.16.12" RPMNAME="yast2-ldap-client" MAINTAINER="Jiri Suchomel <jsuchome(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.17.19/src/ldap_browser.ycp new/yast2-ldap-client-2.18.0/src/ldap_browser.ycp --- old/yast2-ldap-client-2.17.19/src/ldap_browser.ycp 2009-01-08 15:00:53.000000000 +0100 +++ new/yast2-ldap-client-2.18.0/src/ldap_browser.ycp 2009-01-08 15:10:57.000000000 +0100 @@ -4,7 +4,7 @@ * Summary: Simple browser and editor of LDAP tree * Author: Jiri Suchomel <jsuchome(a)suse.cz> * - * $Id: ldap_browser.ycp 50867 2008-09-09 09:18:15Z jsuchome $ + * $Id: ldap_browser.ycp 54476 2009-01-08 14:10:57Z jsuchome $ * */ { @@ -248,10 +248,8 @@ if (size (items) == 0) UI::ChangeWidget (`id(`edit), `Enabled, false); else - { // no item is selected UI::ChangeWidget (`table, `CurrentItem, nil); - } UI::ChangeWidget (`id(`save), `Enabled, false); UI::SetFocus (`id(`table)); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.17.19/src/Ldap.ycp new/yast2-ldap-client-2.18.0/src/Ldap.ycp --- old/yast2-ldap-client-2.17.19/src/Ldap.ycp 2008-12-16 08:00:18.000000000 +0100 +++ new/yast2-ldap-client-2.18.0/src/Ldap.ycp 2009-01-15 14:46:42.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: Ldap.ycp 54100 2008-12-12 15:18:32Z jsuchome $ + * $Id: Ldap.ycp 54645 2009-01-15 13:46:41Z jsuchome $ */ { @@ -945,6 +945,12 @@ // this is a hack global define integer GetFirstPort (string servers) ``{ + if (bind_pass == nil && servers == "") + { + y2milestone ("--- server not read yet or empty, reading now"); + servers = ReadLdapConfEntry ("host", ""); + } + list l_servers = splitstring (servers, " \t"); string srv = l_servers[0]:""; if (!issubstring (srv, ":")) @@ -1122,7 +1128,8 @@ // password entering label `Password(`id(`pw), `opt (`hstretch), _("&LDAP Server Password")), // label - `Label (sformat (_("Server: %1"), GetFirstServer (server))), + `Label (sformat (_("Server: %1:%2"), + GetFirstServer (server), GetFirstPort (server))), // label (%1 is admin DN - string) `Label (sformat (_("Administrator: %1"), GetBindDN ())), `HBox( diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.17.19/src/ui.ycp new/yast2-ldap-client-2.18.0/src/ui.ycp --- old/yast2-ldap-client-2.17.19/src/ui.ycp 2008-12-16 08:00:18.000000000 +0100 +++ new/yast2-ldap-client-2.18.0/src/ui.ycp 2009-02-03 12:36:06.000000000 +0100 @@ -5,7 +5,7 @@ * Authors: Thorsten Kukuk <kukuk(a)suse.de> * Anas Nashif <nashif(a)suse.de> * - * $Id: ui.ycp 52910 2008-11-05 12:07:46Z jsuchome $ + * $Id: ui.ycp 54620 2009-01-14 14:39:17Z jsuchome $ * * All user interface functions. */ @@ -45,7 +45,7 @@ boolean ret = true; if (!Stage::cont () || contains (WFM::Args (), "from_users")) { - ret = Popup::ReallyAbort (Modified());; + ret = Modified() ? Popup::ReallyAbort (true) : true; } else { @@ -377,11 +377,15 @@ } } - if (result == `next || result == `advanced) { + if (result == `next || result == `advanced) + { base_dn = (string) UI::QueryWidget(`id(`ldapbasedn), `Value); autofs = Ldap::_autofs_allowed && (boolean) UI::QueryWidget (`id (`autofs), `Value); + } + if ((result == `next || result == `advanced) && start) + { if (base_dn == "") { // error popup label @@ -406,7 +410,7 @@ continue; } } - if ((result == `abort || result == `cancel) && + if ((result == `abort || result == `cancel || result == `back) && ReallyAbort () != `abort) { result = `not_next; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ldap-client-2.17.19/VERSION new/yast2-ldap-client-2.18.0/VERSION --- old/yast2-ldap-client-2.17.19/VERSION 2009-01-08 14:55:33.000000000 +0100 +++ new/yast2-ldap-client-2.18.0/VERSION 2009-02-03 15:38:49.000000000 +0100 @@ -1 +1 @@ -2.17.19 +2.18.0 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-installation for openSUSE:Factory
by root＠Hilbert.suse.de 03 Feb '09

03 Feb '09

Hello community, here is the log from the commit of package yast2-installation for openSUSE:Factory checked in at Wed Feb 4 00:57:42 CET 2009. -------- --- yast2-installation/yast2-installation.changes 2009-01-28 16:00:31.000000000 +0100 +++ yast2-installation/yast2-installation.changes 2009-02-02 16:56:51.000000000 +0100 @@ -1,0 +2,8 @@ +Mon Feb 2 13:09:08 CET 2009 - locilka(a)suse.cz + +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). +- InstError can now save YaST logs on user request. +- 2.18.4 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-installation-2.18.3.tar.bz2 New: ---- yast2-installation-2.18.4.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-installation.spec ++++++ --- /var/tmp/diff_new_pack.D11108/_old 2009-02-04 00:56:09.000000000 +0100 +++ /var/tmp/diff_new_pack.D11108/_new 2009-02-04 00:56:09.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-installation (Version 2.18.3) +# spec file for package yast2-installation (Version 2.18.4) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-installation -Version: 2.18.3 +Version: 2.18.4 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-installation-2.18.3.tar.bz2 +Source0: yast2-installation-2.18.4.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libxslt perl-XML-Writer sgml-skel update-desktop-files yast2-core-devel yast2-devtools yast2-testsuite # xmllint @@ -124,7 +124,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-installation-2.18.3 +%setup -n yast2-installation-2.18.4 %build %{prefix}/bin/y2tool y2autoconf @@ -195,6 +195,11 @@ %exclude %{prefix}/share/doc/packages/yast2-installation/COPYING %exclude %{prefix}/share/doc/packages/yast2-installation/README %changelog +* Mon Feb 02 2009 locilka(a)suse.cz +- Erasing all old additional control files in the final step of + upgrade before rebooting to the second stage (bnc #471454). +- InstError can now save YaST logs on user request. +- 2.18.4 * Wed Jan 28 2009 locilka(a)suse.cz - Added new InstError module for unified reporting of errors during installation. ++++++ yast2-installation-2.18.3.tar.bz2 -> yast2-installation-2.18.4.tar.bz2 ++++++ ++++ 9626 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.3/configure.in new/yast2-installation-2.18.4/configure.in --- old/yast2-installation-2.18.3/configure.in 2009-01-22 12:44:27.000000000 +0100 +++ new/yast2-installation-2.18.4/configure.in 2009-02-03 16:36:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-installation, 2.18.1, http://bugs.opensuse.org/, yast2-installation) +AC_INIT(yast2-installation, 2.18.4, http://bugs.opensuse.org/, yast2-installation) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.1" +VERSION="2.18.4" RPMNAME="yast2-installation" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.3/src/include/inst_inc_first.ycp new/yast2-installation-2.18.4/src/include/inst_inc_first.ycp --- old/yast2-installation-2.18.3/src/include/inst_inc_first.ycp 2009-01-22 13:52:03.000000000 +0100 +++ new/yast2-installation-2.18.4/src/include/inst_inc_first.ycp 2009-02-02 10:48:52.000000000 +0100 @@ -140,7 +140,6 @@ "disks_activate", // disks activated before running upgrade "mode", // always doing update, is already preselected "update_partition", // no mounting - "do_resize", // why is this included in upgrade at all? it is empty anyway "prepdisk", // disks already mounted, it is dummy in update anyway ], { ProductControl::DisableModule (m); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.3/src/inst_finish/copy_files_finish.ycp new/yast2-installation-2.18.4/src/inst_finish/copy_files_finish.ycp --- old/yast2-installation-2.18.3/src/inst_finish/copy_files_finish.ycp 2009-01-22 12:47:16.000000000 +0100 +++ new/yast2-installation-2.18.4/src/inst_finish/copy_files_finish.ycp 2009-02-02 13:12:34.000000000 +0100 @@ -8,7 +8,7 @@ * Authors: * Jiri Srain <jsrain(a)suse.cz> * - * $Id: copy_files_finish.ycp 54888 2009-01-22 11:47:19Z locilka $ + * $Id: copy_files_finish.ycp 55179 2009-02-02 12:12:35Z locilka $ * */ @@ -65,9 +65,12 @@ SCR::Write (.target.ycp, Installation::destdir + Directory::etcdir + "/control_files/order.ycp", workflows_list); - SCR::Execute (.target.bash, "/bin/mkdir -p " + - "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files'"); + // Remove the directory with all additional control files (if exists) + // and create it again (empty). BNC #471454 + SCR::Execute (.target.bash, sformat ("rm -rf '%1'; /bin/mkdir -p '%1'", + String::Quote (Installation::destdir + Directory::etcdir + "/control_files"))); + // Now copy all the additional control files to the just installed system foreach (string file, WorkflowManager::GetAllUsedControlFiles(), { SCR::Execute (.target.bash, "/bin/cp '" + String::Quote (file) + "' " + "'" + String::Quote (Installation::destdir) + Directory::etcdir + "/control_files/'"); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.3/src/modules/InstError.ycp new/yast2-installation-2.18.4/src/modules/InstError.ycp --- old/yast2-installation-2.18.3/src/modules/InstError.ycp 2009-01-28 15:01:45.000000000 +0100 +++ new/yast2-installation-2.18.4/src/modules/InstError.ycp 2009-02-02 16:55:11.000000000 +0100 @@ -16,9 +16,62 @@ import "Icon"; import "Label"; + import "String"; + import "Report"; + + boolean SaveLogs () { + map cmd = (map) WFM::Execute (.local.bash_output, "echo ${HOME}"); + string homedir = "/"; + + if (cmd["exit"]:-1 == 0) { + homedir = splitstring (cmd["stdout"]:"/", "\n")[0]:"/"; + if (homedir == "") homedir = "/"; + } else { + y2warning ("Unable to find out home dir: %1, using %2", cmd, homedir); + } + homedir = sformat ("%1/y2logs.tgz", homedir); + + string savelogsto = (string) UI::AskForSaveFileName ( + homedir, + "*.tgz *.tar.gz *.tar.bz2", + _("Save y2logs to...") + ); + + if (savelogsto == nil) + return nil; + + // Busy message, %1 is replaced with a filename + UI::OpenDialog (`Label (sformat (_("Saving YaST logs to %1..."), savelogsto))); + y2milestone ("Saving YaST logs to: %1", savelogsto); + + cmd = (map) WFM::Execute (.local.bash_output, sformat ("save_y2logs '%1'", String::Quote (savelogsto))); + boolean dialog_ret = nil; + + if (cmd["exit"]:-1 != 0) { + y2error ("Unable to save logs to %1", savelogsto); + + Report::Error (sformat ( + // Error message, %1 is replaced with a filename + // %2 with am error reason (there is a newline between %1 and %2) + _("Unable to save YaST logs to %1 +%2"), + savelogsto, + cmd["stderr"]:"" + )); + + dialog_ret = false; + } else { + y2milestone ("Logs have been saved to: %1", savelogsto); + dialog_ret = true; + } + + UI::CloseDialog(); + + return dialog_ret; + } global void ShowErrorPopUp (string heading, string error_text, string details) { - boolean success = UI::OpenDialog (`VBox ( + boolean success = (boolean) UI::OpenDialog (`VBox ( `Left (`HBox ( `HSquash (`MarginBox (0.5, 0.2, Icon::Error())), `Heading (heading) @@ -55,7 +108,11 @@ ))) ) ), - `ButtonBox (`PushButton (`id(`ok), Label::OKButton())) + `ButtonBox ( + // FIXME: BNC #422612, Use `opt(`noSanityCheck) later + `PushButton (`id(`save_y2logs), `opt(`cancelButton), _("&Save YaST Logs...")), + `PushButton (`id(`ok), Label::OKButton()) + ) )); if (success != true) { @@ -63,7 +120,17 @@ return; } - UI::UserInput(); + any uret = nil; + + while (true) { + uret = UI::UserInput(); + + if (uret == `save_y2logs) { + SaveLogs(); + } else { + break; + } + } UI::CloseDialog(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-installation-2.18.3/VERSION new/yast2-installation-2.18.4/VERSION --- old/yast2-installation-2.18.3/VERSION 2009-01-27 17:39:04.000000000 +0100 +++ new/yast2-installation-2.18.4/VERSION 2009-02-02 13:12:58.000000000 +0100 @@ -1 +1 @@ -2.18.3 +2.18.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2-add-on for openSUSE:Factory
by root＠Hilbert.suse.de 03 Feb '09

03 Feb '09

Hello community, here is the log from the commit of package yast2-add-on for openSUSE:Factory checked in at Wed Feb 4 00:50:37 CET 2009. -------- --- yast2-add-on/yast2-add-on.changes 2009-01-26 16:53:36.000000000 +0100 +++ yast2-add-on/yast2-add-on.changes 2009-02-02 14:40:56.000000000 +0100 @@ -1,0 +2,9 @@ +Mon Feb 2 14:34:27 CET 2009 - locilka(a)suse.cz + +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.18.2 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-add-on-2.18.1.tar.bz2 New: ---- yast2-add-on-2.18.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-add-on.spec ++++++ --- /var/tmp/diff_new_pack.m30977/_old 2009-02-04 00:50:02.000000000 +0100 +++ /var/tmp/diff_new_pack.m30977/_new 2009-02-04 00:50:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-add-on (Version 2.18.1) +# spec file for package yast2-add-on (Version 2.18.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-add-on -Version: 2.18.1 +Version: 2.18.2 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-add-on-2.18.1.tar.bz2 +Source0: yast2-add-on-2.18.2.tar.bz2 Prefix: /usr Requires: autoyast2-installation # PackagesUI module, BNC #469320 @@ -58,7 +58,7 @@ Lukas Ocilka <locilka(a)suse.cz> %prep -%setup -n yast2-add-on-2.18.1 +%setup -n yast2-add-on-2.18.2 %build %{prefix}/bin/y2tool y2autoconf @@ -96,6 +96,12 @@ /usr/share/YaST2/schema/autoyast/rnc/add-on.rnc %doc %{prefix}/share/doc/packages/yast2-add-on %changelog +* Mon Feb 02 2009 locilka(a)suse.cz +- Forcing recreating and redrawing the table of add-on products. +- Opening new wizard window before calling inst_rpmcopy and closing + after it returns. +- Adding more debugging messages (all bnc #471020). +- 2.18.2 * Mon Jan 26 2009 locilka(a)suse.cz - Added new client inst_add-on_software providing the functionality to open package selector in a desired mode (and optionally to ++++++ yast2-add-on-2.18.1.tar.bz2 -> yast2-add-on-2.18.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.18.1/configure new/yast2-add-on-2.18.2/configure --- old/yast2-add-on-2.18.1/configure 2009-01-23 16:49:38.000000000 +0100 +++ new/yast2-add-on-2.18.2/configure 2009-02-02 14:53:10.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for yast2-add-on 2.18.0. +# Generated by GNU Autoconf 2.63 for yast2-add-on 2.18.2. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-add-on' PACKAGE_TARNAME='yast2-add-on' -PACKAGE_VERSION='2.18.0' -PACKAGE_STRING='yast2-add-on 2.18.0' +PACKAGE_VERSION='2.18.2' +PACKAGE_STRING='yast2-add-on 2.18.2' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1274,7 +1274,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2-add-on 2.18.0 to adapt to many kinds of systems. +\`configure' configures yast2-add-on 2.18.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1345,7 +1345,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-add-on 2.18.0:";; + short | recursive ) echo "Configuration of yast2-add-on 2.18.2:";; esac cat <<\_ACEOF @@ -1425,7 +1425,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-add-on configure 2.18.0 +yast2-add-on configure 2.18.2 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1439,7 +1439,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2-add-on $as_me 2.18.0, which was +It was created by yast2-add-on $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2286,7 +2286,7 @@ # Define the identity of the package. PACKAGE='yast2-add-on' - VERSION='2.18.0' + VERSION='2.18.2' cat >>confdefs.h <<_ACEOF @@ -2510,7 +2510,7 @@ -VERSION="2.18.0" +VERSION="2.18.2" RPMNAME="yast2-add-on" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" @@ -3451,7 +3451,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-add-on $as_me 2.18.0, which was +This file was extended by yast2-add-on $as_me 2.18.2, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3501,7 +3501,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-add-on config.status 2.18.0 +yast2-add-on config.status 2.18.2 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.18.1/configure.in new/yast2-add-on-2.18.2/configure.in --- old/yast2-add-on-2.18.1/configure.in 2009-01-23 16:49:36.000000000 +0100 +++ new/yast2-add-on-2.18.2/configure.in 2009-02-02 14:53:08.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.17.6 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-add-on, 2.18.0, http://bugs.opensuse.org/, yast2-add-on) +AC_INIT(yast2-add-on, 2.18.2, http://bugs.opensuse.org/, yast2-add-on) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.18.0" +VERSION="2.18.2" RPMNAME="yast2-add-on" MAINTAINER="Lukas Ocilka <locilka(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.18.1/src/add-on-workflow.ycp new/yast2-add-on-2.18.2/src/add-on-workflow.ycp --- old/yast2-add-on-2.18.1/src/add-on-workflow.ycp 2009-01-23 16:09:13.000000000 +0100 +++ new/yast2-add-on-2.18.2/src/add-on-workflow.ycp 2009-02-02 14:29:51.000000000 +0100 @@ -1274,9 +1274,13 @@ symbol result = PackagesUI::RunPackageSelector ($["mode":`summaryMode]); if (result == `accept) { + Wizard::OpenNextBackDialog(); + y2milestone ("Calling inst_rpmcopy"); WFM::call ("inst_rpmcopy"); y2milestone ("Done"); + + Wizard::CloseDialog(); } return true; @@ -1446,28 +1450,51 @@ while (true) { userret = UI::UserInput(); + // Abort if (userret == `abort || userret == `cancel) { + y2warning ("Aborting..."); ret = `abort; break; + + // Closing } else if (userret == `next || userret == `finish) { + y2milestone ("Finishing..."); ret = `next; break; + + // Addin new product } else if (userret == `add) { + y2milestone ("Using new Add-On..."); + if (RunWizard() == `next) { RunAddProductWorkflow(); } CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); + + // Removing product } else if (userret == `delete) { + y2milestone ("Removing selected product..."); + if (RemoveProductWithDependencies()) { CreateAddOnsOverviewDialog(); RedrawAddOnsOverviewTable(); } + + // Redrawing info widget } else if (userret == "list_of_addons") { AdjustInfoWidget(); + + // Calling packager directly } else if (userret == `packager) { + y2milestone ("Calling packager..."); RunPackageSelector(); + + CreateAddOnsOverviewDialog(); + RedrawAddOnsOverviewTable(); + + // Everything else } else { y2error ("Uknown ret: %1", userret); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-add-on-2.18.1/VERSION new/yast2-add-on-2.18.2/VERSION --- old/yast2-add-on-2.18.1/VERSION 2009-01-26 16:41:31.000000000 +0100 +++ new/yast2-add-on-2.18.2/VERSION 2009-02-02 14:43:18.000000000 +0100 @@ -1 +1 @@ -2.18.1 +2.18.2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xterm for openSUSE:Factory
by root＠Hilbert.suse.de 03 Feb '09

03 Feb '09

Hello community, here is the log from the commit of package xterm for openSUSE:Factory checked in at Wed Feb 4 00:49:52 CET 2009. -------- --- xterm/xterm.changes 2009-01-29 15:56:51.000000000 +0100 +++ xterm/xterm.changes 2009-02-03 17:49:16.000000000 +0100 @@ -1,0 +2,25 @@ +Tue Feb 3 17:48:09 CET 2009 - meissner(a)suse.de + +- updated to release xterm-241 + * improve checks for missing bitmap fonts, fallback to "fixed" as + needed to work around broken font-packages (report by Jacek Luczak). + * fix breakage from patch #240 changes for xtermAddInput() (patches + by Jeff Chua, Julien Cristau). + +- updated to release xterm-240 + + * use plink.sh for linking xterm (suggested by Larry Doolittle). + * add resource descriptions for input method to xterm manpage. + * update configure script; consistently append to $CFLAGS rather + than prepend. + * add install-scripts rule to makefile, to allow roi8xterm and uxterm + scripts to be altered independently of install-bin + * add -maximized command-line option and corresponding resource + (prompted by alt.os.linux newsgroup comment). + * modify translations of scrollbar widget using xtermAddInput() (see + patch #181) to accept the actions that the vt100 widget accepts, such as + shift-insert to perform a paste operation (request by Martin Zwickel). + * change default for allowTcapsOps resource to false, since it causes + unexpected behavior for vim users with AltGr. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- xterm-239.tar.bz2 New: ---- xterm-241.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xterm.spec ++++++ --- /var/tmp/diff_new_pack.z28606/_old 2009-02-04 00:49:10.000000000 +0100 +++ /var/tmp/diff_new_pack.z28606/_new 2009-02-04 00:49:10.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package xterm (Version 239) +# spec file for package xterm (Version 241) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -26,8 +26,8 @@ Group: System/X11/Utilities Provides: xorg-x11:/usr/X11R6/bin/xterm XFree86:/usr/X11R6/bin/xterm AutoReqProv: on -Version: 239 -Release: 2 +Version: 241 +Release: 1 Summary: The basic X terminal program Source: ftp://invisible-island.net/xterm/%name-%version.tar.bz2 Source1: luitx @@ -279,6 +279,26 @@ /usr/share/pixmaps/* %changelog +* Tue Feb 03 2009 meissner(a)suse.de +- updated to release xterm-241 + * improve checks for missing bitmap fonts, fallback to "fixed" as + needed to work around broken font-packages (report by Jacek Luczak). + * fix breakage from patch #240 changes for xtermAddInput() (patches + by Jeff Chua, Julien Cristau). +- updated to release xterm-240 + * use plink.sh for linking xterm (suggested by Larry Doolittle). + * add resource descriptions for input method to xterm manpage. + * update configure script; consistently append to $CFLAGS rather + than prepend. + * add install-scripts rule to makefile, to allow roi8xterm and uxterm + scripts to be altered independently of install-bin + * add -maximized command-line option and corresponding resource + (prompted by alt.os.linux newsgroup comment). + * modify translations of scrollbar widget using xtermAddInput() (see + patch #181) to accept the actions that the vt100 widget accepts, such as + shift-insert to perform a paste operation (request by Martin Zwickel). + * change default for allowTcapsOps resource to false, since it causes + unexpected behavior for vim users with AltGr. * Thu Jan 29 2009 mfabian(a)suse.de - bnc#464930: change the default for the ximFont resource from "*" to "fixed", this still works fine with the XIM servers "scim" ++++++ xterm-239.tar.bz2 -> xterm-241.tar.bz2 ++++++ ++++ 11691 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0