March 2009 - openSUSE Commits - openSUSE Mailing Lists

commit PackageKit for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package PackageKit for openSUSE:Factory checked in at Wed Mar 11 21:08:50 CET 2009. -------- --- PackageKit/PackageKit.changes 2009-02-27 23:24:45.000000000 +0100 +++ PackageKit/PackageKit.changes 2009-03-10 21:28:17.000000000 +0100 @@ -1,0 +2,28 @@ +Tue Mar 10 21:16:39 CET 2009 - vuntz(a)novell.com + +- Update to version 0.4.5: + + New features: + - Enable ptrace() on libpackagekit, it was always a bandaid + - python: add a PkError exception class to better handle nested + errors + - Clarify the spec that a Details::size value of zero of a + non-installed file indicates it's in cache and doesn't need + to be downloaded + - Remove the app-install feature, it's now it's own project + - Allow backends to enable simultaneous mode to do actions in + parallel + - Updated QPackageKit soname version to 0.4.1 + - Made package methods const and added an operator== to package + + Bugfixes: + - When we reset a PkClient, get a new reference to a + PkPackageList + - Ensure we set PK_STATUS_ENUM_FINISHED when we return cached + updates + - glib: When we cancel a transaction, don't overwrite the role + as Cancel + - Fix the self test by using actual provides in the catalog + file + + Non-zypp backends updates. + + Updated translations. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- PackageKit-0.4.4.tar.bz2 New: ---- PackageKit-0.4.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ PackageKit.spec ++++++ --- /var/tmp/diff_new_pack.xR6548/_old 2009-03-11 21:05:19.000000000 +0100 +++ /var/tmp/diff_new_pack.xR6548/_new 2009-03-11 21:05:19.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package PackageKit (Version 0.4.4) +# spec file for package PackageKit (Version 0.4.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -18,7 +18,7 @@ Name: PackageKit -Version: 0.4.4 +Version: 0.4.5 Release: 1 License: GPL v2 or later BuildRequires: NetworkManager-devel @@ -426,6 +426,31 @@ %{_datadir}/cmake/Modules/* %changelog +* Tue Mar 10 2009 vuntz(a)novell.com +- Update to version 0.4.5: + + New features: + - Enable ptrace() on libpackagekit, it was always a bandaid + - python: add a PkError exception class to better handle nested + errors + - Clarify the spec that a Details::size value of zero of a + non-installed file indicates it's in cache and doesn't need + to be downloaded + - Remove the app-install feature, it's now it's own project + - Allow backends to enable simultaneous mode to do actions in + parallel + - Updated QPackageKit soname version to 0.4.1 + - Made package methods const and added an operator== to package + + Bugfixes: + - When we reset a PkClient, get a new reference to a + PkPackageList + - Ensure we set PK_STATUS_ENUM_FINISHED when we return cached + updates + - glib: When we cancel a transaction, don't overwrite the role + as Cancel + - Fix the self test by using actual provides in the catalog + file + + Non-zypp backends updates. + + Updated translations. * Fri Feb 27 2009 mboman(a)suse.de - Update to version 0.4.4: + New Features: ++++++ PackageKit-0.4.4.tar.bz2 -> PackageKit-0.4.5.tar.bz2 ++++++ PackageKit/PackageKit-0.4.4.tar.bz2 PackageKit/PackageKit-0.4.5.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 xhtml-dtd for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package xhtml-dtd for openSUSE:Factory checked in at Wed Mar 11 21:05:09 CET 2009. -------- --- xhtml-dtd/xhtml-dtd.changes 2009-03-05 16:24:23.000000000 +0100 +++ xhtml-dtd/xhtml-dtd.changes 2009-03-10 15:04:12.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 10 15:00:58 CET 2009 - ke(a)suse.de + +- Also resolve "-//W3C//ELEMENTS XHTML" and "-//W3C//ENTITIES XHTML"; + reported by Thomas Schraitle (bnc#433355). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xhtml-dtd.spec ++++++ --- /var/tmp/diff_new_pack.nP2828/_old 2009-03-11 21:04:06.000000000 +0100 +++ /var/tmp/diff_new_pack.nP2828/_new 2009-03-11 21:04:06.000000000 +0100 @@ -22,7 +22,7 @@ BuildRequires: sgml-skel Summary: XHTML DTDs (Document Type Definitions) Version: 2008.7.23 -Release: 1 +Release: 2 Group: Productivity/Publishing/HTML/Tools BuildArch: noarch Requires: sgml-skel libxml2 @@ -247,6 +247,12 @@ $xmlcatbin --noout --add "delegatePublic" \ "-//W3C//DTD XHTML" \ "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp +$xmlcatbin --noout --add "delegatePublic" \ + "-//W3C//ELEMENTS XHTML" \ + "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp +$xmlcatbin --noout --add "delegatePublic" \ + "-//W3C//ENTITIES XHTML" \ + "file:///$CATALOG" %{FOR_ROOT_CAT}.tmp # Create tag sed '/<catalog/a\ <group id="%{name}-%{version}-%{release}"> @@ -293,6 +299,9 @@ # spec file ends here %changelog +* Tue Mar 10 2009 ke(a)suse.de +- Also resolve "-//W3C//ELEMENTS XHTML" and "-//W3C//ENTITIES XHTML"; + reported by Thomas Schraitle (bnc#433355). * Thu Mar 05 2009 ro(a)suse.de - try to fix build * Thu Jan 11 2007 ke(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 zypper for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package zypper for openSUSE:Factory checked in at Wed Mar 11 21:04:00 CET 2009. -------- --- zypper/zypper.changes 2009-02-24 16:42:38.000000000 +0100 +++ zypper/zypper.changes 2009-03-10 19:58:10.000000000 +0100 @@ -1,0 +2,19 @@ +Tue Mar 10 19:25:46 CET 2009 - jkupec(a)suse.cz + +- Fixed noarch->anyarch and vice-versa update via 'zypper up foo' + (bnc #483179). +- Fixed list-updates showing not-yet-installed packages + (bnc #483910). +- 1.1.0 + +------------------------------------------------------------------- +Fri Mar 6 15:56:53 CET 2009 - jkupec(a)suse.cz + +- Introduced colors. +- Removed some forgotten control chars from non-terminal output + (bnc #440822). +- Fixed FindReadline to find shared lib, not static. +- Bash completion: allow spaces in repository aliases + (werner(a)suse.de) (bnc #474361) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ zypper.spec ++++++ --- /var/tmp/diff_new_pack.R28579/_old 2009-03-11 20:59:30.000000000 +0100 +++ /var/tmp/diff_new_pack.R28579/_new 2009-03-11 20:59:30.000000000 +0100 @@ -19,7 +19,7 @@ Name: zypper -BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 5.24.0 readline-devel >= 5.1 +BuildRequires: boost-devel >= 1.33.1 gettext-devel >= 0.15 libzypp-devel >= 6.1.0 readline-devel >= 5.1 BuildRequires: cmake >= 2.4.6 gcc-c++ >= 4.1 Requires: procps Recommends: logrotate cron @@ -30,7 +30,7 @@ PreReq: permissions Summary: Command line software manager using libzypp Version: 1.1.0 -Release: 2 +Release: 3 Source: zypper-1.1.0.tar.bz2 Prefix: /usr Url: http://en.opensuse.org/Zypper @@ -116,8 +116,20 @@ # declare ownership of the log file but prevent # it from being erased by rpm -e %ghost %config(noreplace) %{_var}/log/zypper.log - %changelog +* Tue Mar 10 2009 jkupec(a)suse.cz +- Fixed noarch->anyarch and vice-versa update via 'zypper up foo' + (bnc #483179). +- Fixed list-updates showing not-yet-installed packages + (bnc #483910). +- 1.1.0 +* Fri Mar 06 2009 jkupec(a)suse.cz +- Introduced colors. +- Removed some forgotten control chars from non-terminal output + (bnc #440822). +- Fixed FindReadline to find shared lib, not static. +- Bash completion: allow spaces in repository aliases + (werner(a)suse.de) (bnc #474361) * Tue Feb 24 2009 ma(a)suse.de - Let 'zypper clean' keep the raw metadata cache of CD/DVD based repositories. We'd need the CD/DVD again to recreate the data. ++++++ zypper-1.1.0.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/cmake/modules/FindReadline.cmake new/zypper-1.1.0/cmake/modules/FindReadline.cmake --- old/zypper-1.1.0/cmake/modules/FindReadline.cmake 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/cmake/modules/FindReadline.cmake 2009-03-10 19:56:15.000000000 +0100 @@ -18,13 +18,18 @@ /usr/include/readline ) -FIND_LIBRARY(READLINE_LIBRARY NAMES readline +# make find_library look only for shared lib +# otherwise it would find the static libreadline.a +SET(CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP ${CMAKE_FIND_LIBRARY_SUFFIXES}) +SET(CMAKE_FIND_LIBRARY_SUFFIXES ".so") +FIND_LIBRARY(READLINE_LIBRARY readline PATHS /usr/lib /usr/lib64 /usr/local/lib /usr/local/lib64 ) +SET(CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP}) if(READLINE_INCLUDE_DIR AND READLINE_LIBRARY) MESSAGE( STATUS "readline found: includes in ${READLINE_INCLUDE_DIR}, library in ${READLINE_LIBRARY}") diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/.gitignore new/zypper-1.1.0/.gitignore --- old/zypper-1.1.0/.gitignore 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-1.1.0/.gitignore 2009-03-10 19:56:15.000000000 +0100 @@ -0,0 +1,2 @@ +.* +build diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/package/zypper.changes new/zypper-1.1.0/package/zypper.changes --- old/zypper-1.1.0/package/zypper.changes 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/package/zypper.changes 2009-03-10 19:56:15.000000000 +0100 @@ -1,4 +1,23 @@ ------------------------------------------------------------------- +Tue Mar 10 19:25:46 CET 2009 - jkupec(a)suse.cz + +- Fixed noarch->anyarch and vice-versa update via 'zypper up foo' + (bnc #483179). +- Fixed list-updates showing not-yet-installed packages + (bnc #483910). +- 1.1.0 + +------------------------------------------------------------------- +Fri Mar 6 15:56:53 CET 2009 - jkupec(a)suse.cz + +- Introduced colors. +- Removed some forgotten control chars from non-terminal output + (bnc #440822). +- Fixed FindReadline to find shared lib, not static. +- Bash completion: allow spaces in repository aliases + (werner(a)suse.de) (bnc #474361) + +------------------------------------------------------------------- Tue Feb 24 16:38:16 CET 2009 - ma(a)suse.de - Let 'zypper clean' keep the raw metadata cache of CD/DVD based diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/bash-completion.sh new/zypper-1.1.0/src/bash-completion.sh --- old/zypper-1.1.0/src/bash-completion.sh 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/bash-completion.sh 2009-03-10 19:56:15.000000000 +0100 @@ -1,83 +1,157 @@ -# zypper completion v 0.2 aplha 2 :-) +# zypper bash completion script +# # A hackweek gift from Marek Stopka <mstopka(a)opensuse.org> +# Major rewrite by Josef Reidinger <jreidinger(a)suse.cz> +# 2009/02/19 Allow empty spaces in repos names, Werner Fink <werner(a)suse.de> # # some TODOs: # - complete package names for install/remove/update +_strip() +{ + local s c o + if test ${#COMPREPLY[@]} -gt 0 ; then + s="${COMP_WORDBREAKS// }" + s="${s// }" + s="${s//[\{\}()\[\]]}" + s="${s} (){}[]" + o=${#s} + while test $((o--)) -gt 0 ; do + c="${s:${o}:1}" + COMPREPLY=(${COMPREPLY[*]//${c}/\\${c}}) + done + fi +} + _zypper() { ZYPPER_CMDLIST=() - ZYPPER="/usr/bin/zypper -q" + ZYPPER="$(type -p zypper)" + + local noglob=$(shopt -po noglob) local magic_string="Command options:" - local opts opts2 cur prev command ITER - if test ${#ZYPPER_CMDLIST[*]} = 0; then - for foo in $(LC_ALL=C $ZYPPER -h | sed -e "1,/Commands:/d" -e "/\t\t\t\t/d" | awk -F ' ' '{print $1} {print $2}' | sed -e 's/,//' -e 's/[[:upper:]].*//'); do - ZYPPER_CMDLIST="${ZYPPER_CMDLIST} $foo" - done - ZYPPER_CMDLIST="${ZYPPER_CMDLIST} " + local comp cur prev command + local -a opts=() + local -i ITER=0 + local IFS=$'\n' + + # Do not expand `?' for help + set -o noglob + + if test ${#ZYPPER_CMDLIST[@]} -eq 0; then + ZYPPER_CMDLIST=($(LC_ALL=POSIX $ZYPPER -q -h | \ + sed -rn '/^[[:blank:]]*Commands:/,$ { + /[\t]{4}/d + s/^[[:blank:]]*// + s/^[[:upper:]].*:// + s/[[:blank:]]+[[:upper:]].*$// + s/,[[:blank:]]+/\n/ + s/\?/\\?/ + /^$/d + p + }')) fi - cur=${COMP_WORDS[COMP_CWORD]} + if test $COMP_CWORD -lt 1 ; then + let COMP_CWORD=${#COMP_WORDS[@]} + fi prev=${COMP_WORDS[COMP_CWORD-1]} - eval "ITER=$COMP_CWORD-1" - while [[ ${ITER} -ge 0 ]]; do - opts2=${COMP_WORDS[ITER]} - if [[ "${ZYPPER_CMDLIST}" =~ " ${opts2} " ]]; then + cur=${COMP_WORDS[COMP_CWORD]} + + let ITER=COMP_CWORD + while test $((ITER--)) -ge 0 ; do + comp="${COMP_WORDS[ITER]}" + if [[ "${ZYPPER_CMDLIST[@]}" =~ "${comp}" ]]; then command=${COMP_WORDS[ITER]} break; fi - if [[ "${opts2}" =~ "zypper" ]]; then - + if [[ "${comp}" =~ "zypper" ]]; then command="zypper" break; fi - eval "ITER=$ITER-1" done + unset ITER comp case "$prev" in "--type" | "-t") - opts="package patch pattern product" - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + opts=(package patch pattern product) + COMPREPLY=($(compgen -W "${opts[*]}" -- ${cur})) + _strip + eval $noglob return 0; ;; "--repo" | "-r") - opts="${opts} $(LC_ALL=C $ZYPPER lr | sed -e '1,2 d' -e 's/^[0-9]\+[[:space:]]\+|[[:space:]]*$[^|]\+$|.*$/\1/' -e 's/[[:space:]]*$//')" - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + opts=(${opts[@]}$(echo; LC_ALL=POSIX $ZYPPER -q lr | \ + sed -rn '/^[0-9]/{ + s/^[0-9]+[[:blank:]]*\|[[:blank:]]*([^|]+).*/\1/ + s/[[:blank:]]*$// + p + }')) + COMPREPLY=($(compgen -W "${opts[*]}" -- ${cur})) + _strip + eval $noglob return 0; ;; esac + unset prev if [[ "$command" =~ "zypper" ]]; then - opts=$ZYPPER_CMDLIST - opts2=$(LC_ALL=C $ZYPPER help 2>&1 | sed -e "1,/Global Options:/d" -e "/Commands:/,$ d" -e 's/.*--/--/' -e 's/[,[:space:]].*//' -e '/^$/d') - opts="${opts} ${opts2}" - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + opts=(${ZYPPER_CMDLIST[*]}$(echo; LC_ALL=POSIX $ZYPPER -q help 2>&1 | \ + sed -rn '/Global Options:/,/Commands:/{ + /[\t]{4}/d + s/^[[:blank:]]*// + /[[:upper:]].*:/d + s/[[:blank:]]+[[:upper:]].*$// + s/[,[:blank:]].*$/\n/ + /^$/d + p + }')) + COMPREPLY=($(compgen -W "${opts[*]}" -- ${cur})) + _strip + eval $noglob return 0; fi - if [ -n "$command" ]; then - opts=$(LC_ALL=C $ZYPPER help $command 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//') - + if test -n "$command" ; then + opts=$(LC_ALL=POSIX $ZYPPER -q help $command 2>&1 | sed -e "1,/$magic_string/d" -e 's/.*--/--/' -e 's/ .*//') + #handling individual commands if they need more then we can dig from help case "$command" in - help | ?) - opts=$ZYPPER_CMDLIST + help | \?) + opts=(${ZYPPER_CMDLIST[@]}) ;; removerepo | rr | modifyrepo | mr | renamerepo | nr | refresh | ref) - opts2=$(LC_ALL=C $ZYPPER lr | sed -e '1,2 d' -e 's/^[0-9]\+[[:space:]]\+|[[:space:]]*$[^|]\+$|.*$/\1/' -e 's/[[:space:]]*$//' -e 's/ /\\ /g' -e "s/^$.*$$/'\1'/") - opts="${opts} ${opts2}" + opts=(${opts[@]}$(echo; LC_ALL=POSIX $ZYPPER -q lr | \ + sed -rn '/^[0-9]/{ + s/^[0-9]+[[:blank:]]*\|[[:blank:]]*([^|]+).*/\1/ + s/[[:blank:]]*$// + /^$/d + p + }')) ;; addservice | as | modifyservice | ms | removeservice | rs) - opts2=$(LC_ALL=C $ZYPPER ls | sed -e '1,2 d' -e 's/^[0-9]\+[[:space:]]\+|[[:space:]]*$[^|]\+$|.*$/\1/' -e 's/[[:space:]]*$//' -e 's/ /\\ /g' -e "s/^$.*$$/'\1'/") - opts="${opts} ${opts2}" + opts=(${opts[@]}$(echo; LC_ALL=POSIX $ZYPPER -q ls | \ + sed -rn '/^[0-9]/{ + s/^[0-9]+[[:blank:]]*\|[[:blank:]]*([^|]+).*/\1/ + s/[[:blank:]]*$// + /^$/d + p + }')) ;; removelock | rl) - opts2=$(LC_ALL=C $ZYPPER ll | sed -e '1,2 d' | cut -d '|' -f 2) - opts="${opts} ${opts2}" + opts=(${opts[@]}$(echo; LC_ALL=POSIX $ZYPPER -q ll | \ + sed -rn '/^[0-9]/{ + s/^[0-9]+[[:blank:]]*\|[[:blank:]]*([^|]+).*/\1/p + s/[[:blank:]]*$// + /^$/d + p + }')) ;; esac - - COMPREPLY=($(compgen -W "${opts}" -- ${cur})) + IFS=$'\n' + COMPREPLY=($(compgen -W "${opts[*]}" -- ${cur})) + _strip fi + eval $noglob } complete -F _zypper -o default zypper diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/CMakeLists.txt new/zypper-1.1.0/src/CMakeLists.txt --- old/zypper-1.1.0/src/CMakeLists.txt 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/CMakeLists.txt 2009-03-10 19:56:15.000000000 +0100 @@ -58,6 +58,7 @@ ) SET( zypper_utils_HEADERS + utils/colors.h utils/getopt.h utils/messages.h utils/misc.h @@ -67,6 +68,7 @@ ) SET( zypper_utils_SRCS + utils/colors.cc utils/getopt.cc utils/messages.cc utils/misc.cc diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/Command.h new/zypper-1.1.0/src/Command.h --- old/zypper-1.1.0/src/Command.h 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/Command.h 2009-03-10 19:56:15.000000000 +0100 @@ -90,71 +90,72 @@ enum Command { - ADD_SERVICE_e, - REMOVE_SERVICE_e, - MODIFY_SERVICE_e, - LIST_SERVICES_e, - REFRESH_SERVICES_e, - - ADD_REPO_e, - REMOVE_REPO_e, - RENAME_REPO_e, - MODIFY_REPO_e, - LIST_REPOS_e, - REFRESH_e, - CLEAN_e, - - INSTALL_e, - REMOVE_e, - SRC_INSTALL_e, - VERIFY_e, - INSTALL_NEW_RECOMMENDS_e, - - UPDATE_e, - LIST_UPDATES_e, - PATCH_e, - LIST_PATCHES_e, - PATCH_CHECK_e, - DIST_UPGRADE_e, - - SEARCH_e, - INFO_e, - PACKAGES_e, - PATCHES_e, - PATTERNS_e, - PRODUCTS_e, - WHAT_PROVIDES_e, + ADD_SERVICE_e = 1, + REMOVE_SERVICE_e = 2, + MODIFY_SERVICE_e = 3, + LIST_SERVICES_e = 4, + REFRESH_SERVICES_e = 5, + + ADD_REPO_e = 10, + REMOVE_REPO_e = 11, + RENAME_REPO_e = 12, + MODIFY_REPO_e = 13, + LIST_REPOS_e = 14, + REFRESH_e = 15, + CLEAN_e = 16, + + INSTALL_e = 20, + REMOVE_e = 21, + SRC_INSTALL_e = 22, + VERIFY_e = 23, + INSTALL_NEW_RECOMMENDS_e = 24, + + UPDATE_e = 30, + LIST_UPDATES_e = 31, + PATCH_e = 32, + LIST_PATCHES_e = 33, + PATCH_CHECK_e = 34, + DIST_UPGRADE_e = 35, + + SEARCH_e = 40, + INFO_e = 41, + PACKAGES_e = 42, + PATCHES_e = 43, + PATTERNS_e = 44, + PRODUCTS_e = 45, + + WHAT_PROVIDES_e = 50, //WHAT_REQUIRES_e, //WHAT_CONFLICTS_e, - ADD_LOCK_e, - REMOVE_LOCK_e, - LIST_LOCKS_e, - CLEAN_LOCKS_e, - - TARGET_OS_e, - VERSION_CMP_e, - LICENSES_e, - - HELP_e, - SHELL_e, - SHELL_QUIT_e, - MOO_e, - - NONE_e, - - RUG_PATCH_INFO_e, - RUG_PATTERN_INFO_e, - RUG_PRODUCT_INFO_e, - RUG_SERVICE_TYPES_e, - RUG_LIST_RESOLVABLES_e, - RUG_MOUNT_e, - RUG_INFO_PROVIDES_e, - RUG_INFO_CONFLICTS_e, - RUG_INFO_OBSOLETES_e, - RUG_INFO_REQUIREMENTS_e, - RUG_PATCH_SEARCH_e, - RUG_PING_e + ADD_LOCK_e = 60, + REMOVE_LOCK_e = 61, + LIST_LOCKS_e = 62, + CLEAN_LOCKS_e = 63, + + TARGET_OS_e = 80, + VERSION_CMP_e = 81, + LICENSES_e = 82, + + HELP_e = 90, + SHELL_e = 91, + SHELL_QUIT_e = 92, + MOO_e = 93, + + NONE_e = 0, + + RUG_PATCH_INFO_e = 101, + RUG_PATTERN_INFO_e = 102, + RUG_PRODUCT_INFO_e = 103, + RUG_SERVICE_TYPES_e = 104, + RUG_LIST_RESOLVABLES_e = 105, + RUG_MOUNT_e = 106, + RUG_INFO_PROVIDES_e = 107, + RUG_INFO_CONFLICTS_e = 108, + RUG_INFO_OBSOLETES_e = 109, + RUG_INFO_REQUIREMENTS_e = 110, + RUG_PATCH_SEARCH_e = 111, + RUG_PING_e = 112 }; ZypperCommand(Command command) : _command(command) {} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/output/OutNormal.cc new/zypper-1.1.0/src/output/OutNormal.cc --- old/zypper-1.1.0/src/output/OutNormal.cc 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/output/OutNormal.cc 2009-03-10 19:56:15.000000000 +0100 @@ -1,3 +1,10 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + #include <iostream> #include <sstream> @@ -7,7 +14,8 @@ #include "zypp/ByteCount.h" // for download progress reporting #include "zypp/base/String.h" // for toUpper() -#include "../main.h" +#include "main.h" +#include "utils/colors.h" #include "AliveCursor.h" #include "OutNormal.h" @@ -18,6 +26,11 @@ using std::string; using std::ostringstream; +OutNormal::OutNormal(Verbosity verbosity) + : Out(TYPE_NORMAL, verbosity), + _has_colors(has_colors()), _isatty(isatty(STDOUT_FILENO)) +{} + OutNormal::~OutNormal() { @@ -44,19 +57,30 @@ { if (infoWarningFilter(verbosity, mask)) return; - cout << msg << endl; + + if (_has_colors && verbosity > Out::QUIET) + cout << COLOR_WHITE << msg << COLOR_RESET << endl; + else + cout << msg << endl; } void OutNormal::warning(const std::string & msg, Verbosity verbosity, Type mask) { if (infoWarningFilter(verbosity, mask)) return; - info(_("Warning: ") + msg, verbosity, mask); + + if (_has_colors) + cout << COLOR_YELLOW_BOLD << _("Warning: ") << COLOR_RESET << msg << endl; + else + cout << msg << endl; } void OutNormal::error(const std::string & problem_desc, const std::string & hint) { - cerr << problem_desc; + if (_has_colors) + cerr << COLOR_RED_BOLD << problem_desc << COLOR_RESET; + else + cerr << problem_desc; if (!hint.empty() && this->verbosity() > Out::QUIET) cerr << endl << hint; cerr << endl; @@ -68,12 +92,19 @@ const string & problem_desc, const string & hint) { + if (_has_colors) + cerr << COLOR_RED_BOLD; + // problem cerr << problem_desc << endl; // cause cerr << zyppExceptionReport(e) << endl; + + if (_has_colors) + cerr << COLOR_RESET; + // hint - if (!hint.empty()) + if (!hint.empty() && this->verbosity() > Out::QUIET) cerr << hint << endl; } @@ -122,13 +153,19 @@ if (progressFilter()) return; - if (!isatty(STDOUT_FILENO)) + if (_has_colors) + cerr << COLOR_WHITE; + + if (!_isatty) cout << label << " ["; if (is_tick) display_tick(id, label); else display_progress(id, label, 0); + + if (_has_colors) + cerr << COLOR_RESET; } void OutNormal::progress(const std::string & id, const string & label, int value) @@ -136,10 +173,16 @@ if (progressFilter()) return; + if (_has_colors) + cerr << COLOR_WHITE; + if (value) display_progress(id, label, value); else display_tick(id, label); + + if (_has_colors) + cerr << COLOR_RESET; } void OutNormal::progressEnd(const std::string & id, const string & label, bool error) @@ -147,10 +190,22 @@ if (progressFilter()) return; - if (isatty(STDOUT_FILENO)) - cout << CLEARLN << label << " [" << (error ? _("error") : _("done")) << "]"; - else - cout << "]"; + if (_has_colors) + cerr << COLOR_WHITE; + + if (_isatty) + { + cout << CLEARLN << label << " ["; + if (error) + print_color(_("error"), COLOR_RED, COLOR_WHITE); + else + cout << _("done"); + } + cout << "]"; + + if (_has_colors) + cerr << COLOR_RESET; + cout << endl << std::flush; } @@ -160,6 +215,9 @@ if (verbosity() < NORMAL) return; + if (_has_colors) + cerr << COLOR_WHITE; + if (isatty(STDOUT_FILENO)) cout << CLEARLN; cout << _("Retrieving:") << " "; @@ -171,6 +229,10 @@ cout << " [" << _("starting") << "]"; //! \todo align to the right else cout << " [" ; + + if (_has_colors) + cerr << COLOR_RESET; + cout << std::flush; } @@ -180,12 +242,16 @@ { if (verbosity() < NORMAL) return; + if (!isatty(STDOUT_FILENO)) { cout << '.' << std::flush; return; } + if (_has_colors) + cerr << COLOR_WHITE; + cout << CLEARLN << _("Retrieving:") << " "; if (verbosity() == DEBUG) cout << uri; //! \todo shorten to fit the width of the terminal @@ -202,6 +268,9 @@ cout << "]"; } + if (_has_colors) + cerr << COLOR_RESET; + cout << std::flush; } @@ -210,7 +279,10 @@ if (verbosity() < NORMAL) return; - if (isatty(STDOUT_FILENO)) + if (_has_colors) + cerr << COLOR_WHITE; + + if (_isatty) { cout << CLEARLN << _("Retrieving:") << " "; if (verbosity() == DEBUG) @@ -218,11 +290,21 @@ else cout << zypp::Pathname(uri.getPathName()).basename(); cout << " ["; + if (error) + print_color(_("error"), COLOR_RED, COLOR_WHITE); + else + cout << _("done"); } - cout << (error ? _("error") : _("done")); + else + cout << (error ? _("error") : _("done")); + if (rate >= 0) cout << " (" << zypp::ByteCount(rate) << "/s)"; cout << "]"; + + if (_has_colors) + cerr << COLOR_RESET; + cout << endl << std::flush; } @@ -232,12 +314,15 @@ const std::string & startdesc) { if (startdesc.empty()) - cout << CLEARLN; + { + if (_isatty) + cout << CLEARLN; + } else cout << startdesc << endl; cout << prompt; if (!poptions.empty()) - cout << " [" << poptions.optionString() << "]"; + cout << " [" << (_has_colors ? poptions.optionStringColored() : poptions.optionString()) << "]"; cout << ": " << std::flush; } @@ -264,5 +349,5 @@ } } - cout << endl << "[" << poptions.optionString() << "]: " << std::flush; + cout << endl << "[" << (_has_colors ? poptions.optionStringColored() : poptions.optionString()) << "]: " << std::flush; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/output/OutNormal.h new/zypper-1.1.0/src/output/OutNormal.h --- old/zypper-1.1.0/src/output/OutNormal.h 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/output/OutNormal.h 2009-03-10 19:56:15.000000000 +0100 @@ -1,3 +1,10 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + #ifndef OUTNORMAL_H_ #define OUTNORMAL_H_ @@ -6,7 +13,7 @@ class OutNormal : public Out { public: - OutNormal(Verbosity verbosity = NORMAL) : Out(TYPE_NORMAL, verbosity) {} + OutNormal(Verbosity verbosity = NORMAL); virtual ~OutNormal(); public: @@ -20,13 +27,13 @@ /** * Prints \a msg prepended with <tt>"Warning: "</tt> to the standard output * and appends a newline. - * + * * \see Out::warning */ virtual void warning(const std::string & msg, Verbosity verbosity = NORMAL, Type mask = TYPE_ALL); - + /** - * + * */ virtual void error(const std::string & problem_desc, const std::string & hint = ""); virtual void error(const zypp::Exception & e, @@ -52,7 +59,7 @@ virtual void dwnldProgressEnd(const zypp::Url & uri, long rate = -1, bool error = false); - + virtual void prompt(PromptId id, const std::string & prompt, const PromptOptions & poptions, @@ -65,6 +72,8 @@ private: bool infoWarningFilter(Verbosity verbosity, Type mask); + bool _has_colors; + bool _isatty; }; #endif /*OUTNORMAL_H_*/ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/update.cc new/zypper-1.1.0/src/update.cc --- old/zypper-1.1.0/src/update.cc 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/update.cc 2009-03-10 19:56:15.000000000 +0100 @@ -18,6 +18,8 @@ extern ZYpp::Ptr God; +static PoolItem +findInstalledItem( PoolItem item ); // ---------------------------------------------------------------------------- // @@ -229,9 +231,30 @@ } }; +class SaveBetterEditionArch +{ +public: + PoolItem best; + + bool operator()(PoolItem provider) + { + if (!provider.status().isLocked() // is not locked (taboo) + && (!best // first match + // or a better architecture + || best->arch().compare(provider->arch()) < 0 + // or a better edition than so-far-found + || best->edition().compare(provider->edition()) < 0)) + { + best = provider; + } + return true; + } +}; + // ---------------------------------------------------------------------------- -// does not allow changing the arch (#222140). +// does not allow changing the arch (#222140) +// except noarch->any or any->noarch (bnc #483179) // TODO: ignores priority (bnc #464458) // TODO: move to libzypp PoolItem @@ -239,6 +262,7 @@ { SaveBetterEdition info; + // look for the same arch, best version invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), pool.byIdentEnd(item->kind(), item->name()), // get uninstalled, equal kind and arch, better edition @@ -249,6 +273,41 @@ resfilter::byEdition<CompareByGT<Edition> >(item->edition())), functor::functorRef<bool,PoolItem>(info)); + // the item is noarch, look for best arch, best version + // (noarch -> any is allowed) (bnc #483179) + if (item->arch() == Arch_noarch) + { + SaveBetterEditionArch bestEA; + invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), + pool.byIdentEnd(item->kind(), item->name()), + // get uninstalled, equal kind, better edition + functor::chain( + resfilter::ByUninstalled(), + resfilter::byEdition<CompareByGT<Edition> >(item->edition())), + functor::functorRef<bool,PoolItem>(bestEA)); + if (bestEA.best) + { + if (!info.best) + info.best = bestEA.best; + if (info.best->arch().compare(bestEA.best->arch()) < 0) + info.best = bestEA.best; + } + } + // the item is not noarch & no update found so far - try looking for a noarch + // package (any -> noarch is allowed) (bnc #483179) + else if (!info.best) + { + invokeOnEach( pool.byIdentBegin(item->kind(), item->name()), + pool.byIdentEnd(item->kind(), item->name()), + // get uninstalled, equal kind and arch, better edition + functor::chain( + functor::chain( + resfilter::ByUninstalled(), + resfilter::byArch<CompareByEQ<Arch> >(Arch_noarch)), + resfilter::byEdition<CompareByGT<Edition> >(item->edition())), + functor::functorRef<bool,PoolItem>(info)); + } + XXX << "findUpdateItem(" << item << ") => " << info.best; return info.best; } @@ -258,6 +317,8 @@ { PoolItem theone; if (s.installedEmpty()) + //! FIXME this will pick a random arch - should pick the system arch, or + //! the best compatible. theone = findUpdateItem(God->pool(), *s.availableBegin()); else theone = findUpdateItem(God->pool(), *s.installedBegin()); @@ -294,7 +355,9 @@ it = God->pool().begin(), e = God->pool().end(); for (; it != e; ++it) - if (it->status().isToBeInstalled()) + // show every package picked by doUpdate for installation + // except the ones which are not currently installed (bnc #483910) + if (it->status().isToBeInstalled() && findInstalledItem(*it)) candidates.insert(*it); return; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/utils/colors.cc new/zypper-1.1.0/src/utils/colors.cc --- old/zypper-1.1.0/src/utils/colors.cc 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-1.1.0/src/utils/colors.cc 2009-03-10 19:56:15.000000000 +0100 @@ -0,0 +1,40 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + +#include <iostream> +#include <unistd.h> +#include <stdlib.h> +#include <string.h> + +#include "colors.h" + +using namespace std; + +bool has_colors() +{ + if (::isatty(STDOUT_FILENO)) + { + char *term = ::getenv("TERM"); + if (term && ::strcmp(term, "dumb")) + return true; + } + return false; +} + +void print_color(const std::string & s, + const char * ansi_color_seq, const char * prev_color) +{ + if (prev_color) + cout << COLOR_RESET; + + cout << ansi_color_seq << s; + + if (prev_color) + cout << prev_color; + else + cout << COLOR_RESET; +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/utils/colors.h new/zypper-1.1.0/src/utils/colors.h --- old/zypper-1.1.0/src/utils/colors.h 1970-01-01 01:00:00.000000000 +0100 +++ new/zypper-1.1.0/src/utils/colors.h 2009-03-10 19:56:15.000000000 +0100 @@ -0,0 +1,48 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + +#ifndef UTILS_COLORS_H_ +#define UTILS_COLORS_H_ + +#include <iosfwd> + +#define COLOR_GREEN "\033[32m" +#define COLOR_GREEN_BOLD "\033[1;32m" +#define COLOR_RED "\033[31m" +#define COLOR_RED_BOLD "\033[1;31m" +#define COLOR_WHITE "\033[37m" // grey +#define COLOR_WHITE_BOLD "\033[1;37m" +#define COLOR_YELLOW "\033[33m" // brown +#define COLOR_YELLOW_BOLD "\033[1;33m" + +#define COLOR_RESET "\033[m" + +/* +enum zypper_colors +{ + ZYPPER_COLOR_MSG_NORMAL = 1, + ZYPPER_COLOR_MSG_HIGHLIGHTED = 2, + ZYPPER_COLOR_MSG_ERROR = 3, + ZYPPER_COLOR_MSG_WARNING = 4 +}; +*/ + +/** Simple check whether stdout can handle colors. */ +bool has_colors(); + +/** + * Print string \a s in given color. + * + * \param s string to print + * \param ansi_color_seq color to print with + * \param prev_color color to restore after printing. If NULL, + * COLOR_RESET will be used + */ +void print_color(const std::string & s, + const char * ansi_color_seq, const char * prev_color); + +#endif /* UTILS_COLORS_H_ */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/utils/prompt.cc new/zypper-1.1.0/src/utils/prompt.cc --- old/zypper-1.1.0/src/utils/prompt.cc 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/utils/prompt.cc 2009-03-10 19:56:15.000000000 +0100 @@ -1,3 +1,10 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + #include <ctype.h> #include <iostream> #include <sstream> @@ -14,6 +21,8 @@ #include "zypp/base/String.h" #include "Zypper.h" +#include "utils/colors.h" + #include "prompt.h" using namespace std; @@ -22,6 +31,7 @@ // ---------------------------------------------------------------------------- PromptOptions::PromptOptions(const std::string & option_str, unsigned int default_opt) + : _shown_count(-1) { setOptions(option_str, default_opt); } @@ -45,25 +55,71 @@ _default = default_opt; } + + const string PromptOptions::optionString() const { - string option_str; + ostringstream option_str; StrVector::const_iterator it; - if ((it = options().begin()) != options().end()) + unsigned int shown_count = _shown_count < 0 ? options().size() : _shown_count; + + if ((it = options().begin()) != options().end() && shown_count > 0) { - option_str += (defaultOpt() == 0 ? zypp::str::toUpper(*it) : *it); + if (defaultOpt() == 0) + option_str << "_" << *it << "_"; + else + option_str << *it; ++it; } - for (unsigned int i = 1; it != options().end() && i < _shown_count; ++it, ++i) + for (unsigned int i = 1; it != options().end() && i < shown_count; ++it, ++i) if (isEnabled(i)) - option_str += "/" + (defaultOpt() == i ? zypp::str::toUpper(*it) : *it); + { + option_str << "/"; + if (defaultOpt() == i) + option_str << "_" << *it << "_"; + else + option_str << *it; + } if (!_opt_help.empty()) - option_str += "/?"; + option_str << (shown_count > 0 ? "/" : "") << "?"; - return option_str; + return option_str.str(); } +const string PromptOptions::optionStringColored() const +{ + ostringstream option_str; + StrVector::const_iterator it; + unsigned int shown_count = _shown_count < 0 ? options().size() : _shown_count; + + if ((it = options().begin()) != options().end() && shown_count > 0) + { + if (defaultOpt() == 0) + option_str << COLOR_YELLOW << *it; + else + option_str << COLOR_WHITE << *it; + ++it; + } + for (unsigned int i = 1; it != options().end() && i < shown_count; ++it, ++i) + if (isEnabled(i)) + { + option_str << COLOR_WHITE << "/"; + if (defaultOpt() == i) + option_str << COLOR_YELLOW << *it; + else + option_str << *it; + } + + if (!_opt_help.empty()) + option_str << COLOR_WHITE << (shown_count > 0 ? "/" : "") << "?"; + + option_str << COLOR_RESET; + + return option_str.str(); +} + + void PromptOptions::setOptionHelp(unsigned int opt, const std::string & help_str) { if (help_str.empty()) @@ -302,10 +358,9 @@ if (poptions.isYesNoPrompt()) { s << " " << format( - // TranslatorExplanation don't translate the 'y' and 'n', they can always be used as answers. - // The second and the third %s is the translated 'yes' and 'no' string (lowercase). - _("Enter 'y' for '%s' or 'n' for '%s' if nothing else works for you.")) - % _("yes") % _("no"); + // translators: the %s are: 'y', 'n', 'yes' (translated), and 'no' (translated). + _("Enter '%s' for '%s' or '%s' for '%s' if nothing else works for you.")) + % "y" % "n" % _("yes") % _("no"); } zypper.out().prompt(pid, s.str(), poptions); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/utils/prompt.h new/zypper-1.1.0/src/utils/prompt.h --- old/zypper-1.1.0/src/utils/prompt.h 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/utils/prompt.h 2009-03-10 19:56:15.000000000 +0100 @@ -1,3 +1,10 @@ +/*---------------------------------------------------------------------------*\ + ____ _ _ __ _ __ ___ _ _ + |_ / || | '_ \ '_ \/ -_) '_| + /__|\_, | .__/ .__/\___|_| + |__/|_| |_| +\*---------------------------------------------------------------------------*/ + #ifndef ZYPPERPROMPT_H_ #define ZYPPERPROMPT_H_ @@ -27,7 +34,7 @@ /** * Default c-tor. */ - PromptOptions() {}; + PromptOptions() : _shown_count(-1) {}; /** * Constructor. @@ -46,6 +53,7 @@ void setOptions(const std::string & option_str, unsigned int default_opt); unsigned int defaultOpt() const { return _default; } const std::string optionString() const; + const std::string optionStringColored() const; bool empty() const { return _options.empty(); } bool isYesNoPrompt() const; @@ -83,10 +91,10 @@ /** set of options to ignore */ std::set<unsigned int> _disabled; /** - * number of options to show (the rest will still be available and visible - * through '?' help) + * Number of options to show (the rest will still be available and visible + * through '?' help). If negative, all options will be shown. Zero is allowed. */ - unsigned int _shown_count; + int _shown_count; }; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/src/Zypper.cc new/zypper-1.1.0/src/Zypper.cc --- old/zypper-1.1.0/src/Zypper.cc 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/src/Zypper.cc 2009-03-10 19:56:15.000000000 +0100 @@ -8,9 +8,6 @@ // zypper - command line interface for libzypp, the package management library // http://en.opensuse.org/Zypper -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif #include <iostream> #include <fstream> #include <sstream> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/VERSION.cmake new/zypper-1.1.0/VERSION.cmake --- old/zypper-1.1.0/VERSION.cmake 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/VERSION.cmake 2009-03-10 19:56:15.000000000 +0100 @@ -33,5 +33,5 @@ SET(VERSION_MINOR "1") SET(VERSION_PATCH "0") -# LAST RELEASED: 1.0.3 +# LAST RELEASED: 1.1.0 #======= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/zypper-1.1.0/zypper.spec.cmake new/zypper-1.1.0/zypper.spec.cmake --- old/zypper-1.1.0/zypper.spec.cmake 2009-03-04 18:33:41.000000000 +0100 +++ new/zypper-1.1.0/zypper.spec.cmake 2009-03-10 19:56:15.000000000 +0100 @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 5.24.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 +BuildRequires: libzypp-devel >= 6.1.0 boost-devel >= 1.33.1 gettext-devel >= 0.15 readline-devel >= 5.1 BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6 Requires: procps Recommends: logrotate cron ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 empathy for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package empathy for openSUSE:Factory checked in at Wed Mar 11 20:59:22 CET 2009. -------- --- GNOME/empathy/empathy.changes 2009-02-17 04:09:55.000000000 +0100 +++ empathy/empathy.changes 2009-03-06 14:23:38.000000000 +0100 @@ -1,0 +2,14 @@ +Fri Mar 6 14:20:12 CET 2009 - vuntz(a)novell.com + +- Update to version 2.25.92: + + Hardcode some a default codec preferences + + Hook up the video input sidebar item + + Hook up audio input panel + + Use undrafted file transfer spec. + + bgo#572875, Missing translator comments + + Updated translations. +- Don't use AutoReqProv: it's default now. +- Use makeinstall. +- Remove wrong removal of desktop file. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- empathy-2.25.91.tar.bz2 New: ---- empathy-2.25.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ empathy.spec ++++++ --- /var/tmp/diff_new_pack.A27508/_old 2009-03-11 20:58:25.000000000 +0100 +++ /var/tmp/diff_new_pack.A27508/_new 2009-03-11 20:58:25.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package empathy (Version 2.25.91) +# spec file for package empathy (Version 2.25.92) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -40,8 +40,7 @@ Url: http://live.gnome.org/Empathy License: GPL v2 or later Group: Productivity/Networking/Instant Messenger -AutoReqProv: on -Version: 2.25.91 +Version: 2.25.92 Release: 1 Summary: Empathy GNOME Instant Messenger Source: %{name}-%{version}.tar.bz2 @@ -97,15 +96,12 @@ %patch1 -p0 %build -#gnome-autogen.sh %configure --disable-static --with-pic --with-compile-warnings=yes --enable-voip --enable-python=yes\ --disable-scrollkeeper make %{?jobs:-j%jobs} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f %{_datadir}/applications/emapthy.desktop -rm -f ./data/empathy.desktop +%makeinstall rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.*a $RPM_BUILD_ROOT%{_libdir}/*.la # create symlinks for man pages %fdupes -s $RPM_BUILD_ROOT/%_mandir @@ -153,6 +149,17 @@ %files lang -f %{name}.lang %changelog +* Fri Mar 06 2009 vuntz(a)novell.com +- Update to version 2.25.92: + + Hardcode some a default codec preferences + + Hook up the video input sidebar item + + Hook up audio input panel + + Use undrafted file transfer spec. + + bgo#572875, Missing translator comments + + Updated translations. +- Don't use AutoReqProv: it's default now. +- Use makeinstall. +- Remove wrong removal of desktop file. * Tue Feb 17 2009 vuntz(a)novell.com - Update to version 2.25.91: + Set the intial volume button level to a more correct one. ++++++ empathy-2.25.91.tar.bz2 -> empathy-2.25.92.tar.bz2 ++++++ ++++ 93657 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

commit evolution for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package evolution for openSUSE:Factory checked in at Wed Mar 11 20:57:55 CET 2009. -------- --- GNOME/evolution/evolution.changes 2009-02-23 07:56:28.000000000 +0100 +++ evolution/evolution.changes 2009-03-07 01:17:18.000000000 +0100 @@ -1,0 +2,27 @@ +Sat Mar 7 00:58:34 CET 2009 - vuntz(a)novell.com + +- Update to version 2.25.92: + + Bugs Fixed: bgo#238346, bgo#333716, bgo#404232, bgo#404232, + bgo#529037, bgo#548623, bgo#550114, bgo#550114, bgo#551470, + bgo#554458, bgo#555888, bgo#558366, bgo#559027, bgo#559719, + bgo#561465, bgo#563212, bgo#564229, bgo#564229, bgo#567089, + bgo#567949, bgo#568176, bgo#569700, bgo#569986, bgo#570364, + bgo#571625, bgo#571721, bgo#572268, bgo#572348, bgo#572399, + bgo#572543, bgo#572903, bgo#572950, bgo#572962, bgo#572975, + bgo#573198, bgo#566556 + + Other contributions: + - Build a "GUI" executable. + - Do not use non-zero page size in an adjustment, it's + deprecated now. + - Format signature/encryption information nicer. + - Function-declaration compiler warning. + - Migrate from deprecated gtk_window_set_policy to + gtk_window_set_resizable + - Remove deprecated gtk_combo_set_case_sensitive() call. + - Remove useless and deprecated gtk_layout_freeze and + gtk_layout_thaw calls. + - Substitute some deprecated gtk functions. + + Updated Translations. +- Remove -fno-strict-aliasing from compilation flags. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- evolution-2.25.91.tar.bz2 New: ---- evolution-2.25.92.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ evolution.spec ++++++ --- /var/tmp/diff_new_pack.K24398/_old 2009-03-11 20:57:17.000000000 +0100 +++ /var/tmp/diff_new_pack.K24398/_new 2009-03-11 20:57:17.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package evolution (Version 2.25.91) +# spec file for package evolution (Version 2.25.92) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -56,7 +56,7 @@ Group: Productivity/Networking/Email/Clients # This should be updated upon major version changes; it should match BASE_VERSION as defined in configure.in. %define evolution_base_version 2.26 -Version: 2.25.91 +Version: 2.25.92 Release: 1 Summary: The Integrated GNOME Mail, Calendar, and Address Book Suite Source0: ftp://ftp.gnome.org/pub/gnome/sources/evolution/2.25/%{name}-%{version}.tar… @@ -447,9 +447,6 @@ %build autoreconf -f -i -export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" -export FFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{__sed} -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in %{configure} \ --disable-scrollkeeper \ @@ -604,7 +601,31 @@ #%{_libdir}/evolution/*/plugins/*.dll %changelog -* Mon Feb 16 2009 msuman(a)suse.de +* Sat Mar 07 2009 vuntz(a)novell.com +- Update to version 2.25.92: + + Bugs Fixed: bgo#238346, bgo#333716, bgo#404232, bgo#404232, + bgo#529037, bgo#548623, bgo#550114, bgo#550114, bgo#551470, + bgo#554458, bgo#555888, bgo#558366, bgo#559027, bgo#559719, + bgo#561465, bgo#563212, bgo#564229, bgo#564229, bgo#567089, + bgo#567949, bgo#568176, bgo#569700, bgo#569986, bgo#570364, + bgo#571625, bgo#571721, bgo#572268, bgo#572348, bgo#572399, + bgo#572543, bgo#572903, bgo#572950, bgo#572962, bgo#572975, + bgo#573198, bgo#566556 + + Other contributions: + - Build a "GUI" executable. + - Do not use non-zero page size in an adjustment, it's + deprecated now. + - Format signature/encryption information nicer. + - Function-declaration compiler warning. + - Migrate from deprecated gtk_window_set_policy to + gtk_window_set_resizable + - Remove deprecated gtk_combo_set_case_sensitive() call. + - Remove useless and deprecated gtk_layout_freeze and + gtk_layout_thaw calls. + - Substitute some deprecated gtk functions. + + Updated Translations. +- Remove -fno-strict-aliasing from compilation flags. +* Tue Feb 17 2009 msuman(a)suse.de - Update to version 2.25.91: + Bugs fixed: bgo#333716, bgo#404232, bgo#548623, bgo#554458, bgo#555888, bgo#564229, bgo#567089, bgo#568176, bgo#569700, ++++++ evolution-2.25.91.tar.bz2 -> evolution-2.25.92.tar.bz2 ++++++ GNOME/evolution/evolution-2.25.91.tar.bz2 evolution/evolution-2.25.92.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 gnome-main-menu for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package gnome-main-menu for openSUSE:Factory checked in at Wed Mar 11 20:50:01 CET 2009. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2009-02-26 08:53:16.000000000 +0100 +++ gnome-main-menu/gnome-main-menu.changes 2009-03-09 10:50:54.000000000 +0100 @@ -6,0 +7,5 @@ +Mon Feb 16 17:49:47 CET 2009 - sbrabec(a)suse.cz + +- Added support for translation-update-upstream (FATE#301344). + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.s10930/_old 2009-03-11 20:49:46.000000000 +0100 +++ /var/tmp/diff_new_pack.s10930/_new 2009-03-11 20:49:46.000000000 +0100 @@ -19,12 +19,12 @@ Name: gnome-main-menu -BuildRequires: NetworkManager-devel fdupes gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gtk-doc intltool libglade2-devel libgnomeui-devel libgtop-devel librsvg-devel nautilus-devel scrollkeeper update-desktop-files wireless-tools +BuildRequires: NetworkManager-devel fdupes gnome-common gnome-desktop-devel gnome-menus-devel gnome-panel-devel gtk-doc intltool libglade2-devel libgnomeui-devel libgtop-devel librsvg-devel nautilus-devel scrollkeeper translation-update-upstream update-desktop-files wireless-tools License: GPL v2 or later Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.12 -Release: 11 +Release: 12 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.bz2 # # PATCH-FIX-UPSTREAM gnome-main-menu-bgo551850.patch bgo551850 mboman(a)suse.de -- Fix up code to compile with GNOME 2.25.x @@ -92,7 +92,8 @@ %lang_package %prep -%setup -n gnome-main-menu-%{version} +%setup -q +translation-update-upstream %patch0 -p1 %patch1 -p1 @@ -174,6 +175,8 @@ %changelog * Thu Feb 26 2009 vuntz(a)novell.com - Remove custom CFLAGS (-g -O0). +* Mon Feb 16 2009 sbrabec(a)suse.cz +- Added support for translation-update-upstream (FATE#301344). * Tue Feb 10 2009 vuntz(a)novell.com - Remove non-upstream translations: they'll get out-of-date. * Thu Jan 29 2009 vuntz(a)novell.com ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 telepathy-gabble for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package telepathy-gabble for openSUSE:Factory checked in at Wed Mar 11 20:49:38 CET 2009. -------- --- GNOME/telepathy-gabble/telepathy-gabble.changes 2009-02-22 01:04:05.000000000 +0100 +++ telepathy-gabble/telepathy-gabble.changes 2009-03-06 14:20:10.000000000 +0100 @@ -1,0 +2,27 @@ +Fri Mar 6 14:16:59 CET 2009 - vuntz(a)novell.com + +- Update to version 0.7.22: + + Dependencies: + - telepathy-glib 0.7.24 is now required + + Enhancements: + - Resolve STUN servers' IP addresses as required by + telepathy-spec changes currently under development + - Add NATTraversal, STUNServers and CreatedLocally properties + to Media.StreamHandler as required by telepathy-spec changes + currently under development + - Add fallback-stun-server, fallback-stun-port + ConnectionManager parameters + + Fixes: + - Correctly deal with streams that are added after a call is + accepted, fixing video streaming in calls that start off + audio-only + - fdo#20102: fix byte ordering of port in GibberListener + - Drain some swamps in Jingle call handling for better + maintainability, and improve Jingle regression test coverage + - Don't end calls a minute after an extra content is added, and + correctly set the creator attribute on contents. This has the + side-effect of not causing older Gabbles to assert. + - Improve Tubes test coverage, and fix various races in the + tests. + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- telepathy-gabble-0.7.21.tar.bz2 New: ---- telepathy-gabble-0.7.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ telepathy-gabble.spec ++++++ --- /var/tmp/diff_new_pack.VB9955/_old 2009-03-11 20:48:49.000000000 +0100 +++ /var/tmp/diff_new_pack.VB9955/_new 2009-03-11 20:48:49.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package telepathy-gabble (Version 0.7.21) +# spec file for package telepathy-gabble (Version 0.7.22) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,7 +21,7 @@ Name: telepathy-gabble Url: http://telepathy.freedesktop.org/wiki/ Summary: XMPP connection manager for Telepathy -Version: 0.7.21 +Version: 0.7.22 Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -105,6 +105,30 @@ %{_docdir}/%{name}/ %changelog +* Fri Mar 06 2009 vuntz(a)novell.com +- Update to version 0.7.22: + + Dependencies: + - telepathy-glib 0.7.24 is now required + + Enhancements: + - Resolve STUN servers' IP addresses as required by + telepathy-spec changes currently under development + - Add NATTraversal, STUNServers and CreatedLocally properties + to Media.StreamHandler as required by telepathy-spec changes + currently under development + - Add fallback-stun-server, fallback-stun-port + ConnectionManager parameters + + Fixes: + - Correctly deal with streams that are added after a call is + accepted, fixing video streaming in calls that start off + audio-only + - fdo#20102: fix byte ordering of port in GibberListener + - Drain some swamps in Jingle call handling for better + maintainability, and improve Jingle regression test coverage + - Don't end calls a minute after an extra content is added, and + correctly set the creator attribute on contents. This has the + side-effect of not causing older Gabbles to assert. + - Improve Tubes test coverage, and fix various races in the + tests. * Sat Feb 21 2009 mboman(a)suse.de - Update to version 0.7.21: + Implement new tube API for muc stream tubes ++++++ telepathy-gabble-0.7.21.tar.bz2 -> telepathy-gabble-0.7.22.tar.bz2 ++++++ ++++ 22709 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

commit yast2-iscsi-client for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package yast2-iscsi-client for openSUSE:Factory checked in at Wed Mar 11 20:48:41 CET 2009. -------- --- yast2-iscsi-client/yast2-iscsi-client.changes 2009-03-06 09:36:21.000000000 +0100 +++ yast2-iscsi-client/yast2-iscsi-client.changes 2009-03-10 10:31:11.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 10 10:24:11 CET 2009 - mzugec(a)suse.cz + +- hide iBFT passwords (bnc#426945) +- 2.18.5 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-iscsi-client-2.18.4.tar.bz2 New: ---- yast2-iscsi-client-2.18.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-iscsi-client.spec ++++++ --- /var/tmp/diff_new_pack.tJ6567/_old 2009-03-11 20:46:24.000000000 +0100 +++ /var/tmp/diff_new_pack.tJ6567/_new 2009-03-11 20:46:24.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package yast2-iscsi-client (Version 2.18.4) +# spec file for package yast2-iscsi-client (Version 2.18.5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,12 +19,12 @@ Name: yast2-iscsi-client -Version: 2.18.4 +Version: 2.18.5 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-iscsi-client-2.18.4.tar.bz2 +Source0: yast2-iscsi-client-2.18.5.tar.bz2 Prefix: /usr BuildRequires: docbook-xsl-stylesheets doxygen libicu-devel libxslt perl-XML-Writer popt-devel sgml-skel update-desktop-files yast2 yast2-devtools yast2-packagemanager-devel yast2-packager yast2-perl-bindings yast2-testsuite Requires: yast2-packager @@ -41,7 +41,7 @@ %prep -%setup -n yast2-iscsi-client-2.18.4 +%setup -n yast2-iscsi-client-2.18.5 %build %{prefix}/bin/y2tool y2autoconf @@ -78,6 +78,9 @@ %doc %{prefix}/share/doc/packages/yast2-iscsi-client /usr/share/YaST2/schema/autoyast/rnc/iscsi-client.rnc %changelog +* Tue Mar 10 2009 mzugec(a)suse.cz +- hide iBFT passwords (bnc#426945) +- 2.18.5 * Fri Mar 06 2009 mzugec(a)suse.cz - start iscsid during autoyast installation (bnc#482429) - 2.18.4 ++++++ yast2-iscsi-client-2.18.4.tar.bz2 -> yast2-iscsi-client-2.18.5.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.4/configure new/yast2-iscsi-client-2.18.5/configure --- old/yast2-iscsi-client-2.18.4/configure 2009-03-06 09:18:21.000000000 +0100 +++ new/yast2-iscsi-client-2.18.5/configure 2009-03-10 10:22:08.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-iscsi-client 2.18.3. +# Generated by GNU Autoconf 2.63 for yast2-iscsi-client 2.18.4. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -596,8 +596,8 @@ # Identity of this package. PACKAGE_NAME='yast2-iscsi-client' PACKAGE_TARNAME='yast2-iscsi-client' -PACKAGE_VERSION='2.18.3' -PACKAGE_STRING='yast2-iscsi-client 2.18.3' +PACKAGE_VERSION='2.18.4' +PACKAGE_STRING='yast2-iscsi-client 2.18.4' 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-iscsi-client 2.18.3 to adapt to many kinds of systems. +\`configure' configures yast2-iscsi-client 2.18.4 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1346,7 +1346,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-iscsi-client 2.18.3:";; + short | recursive ) echo "Configuration of yast2-iscsi-client 2.18.4:";; esac cat <<\_ACEOF @@ -1426,7 +1426,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-iscsi-client configure 2.18.3 +yast2-iscsi-client configure 2.18.4 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1440,7 +1440,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-iscsi-client $as_me 2.18.3, which was +It was created by yast2-iscsi-client $as_me 2.18.4, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2287,7 +2287,7 @@ # Define the identity of the package. PACKAGE='yast2-iscsi-client' - VERSION='2.18.3' + VERSION='2.18.4' cat >>confdefs.h <<_ACEOF @@ -2511,7 +2511,7 @@ -VERSION="2.18.3" +VERSION="2.18.4" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" @@ -3452,7 +3452,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-iscsi-client $as_me 2.18.3, which was +This file was extended by yast2-iscsi-client $as_me 2.18.4, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3502,7 +3502,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -yast2-iscsi-client config.status 2.18.3 +yast2-iscsi-client config.status 2.18.4 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-iscsi-client-2.18.4/configure.in new/yast2-iscsi-client-2.18.5/configure.in --- old/yast2-iscsi-client-2.18.4/configure.in 2009-03-06 09:18:16.000000000 +0100 +++ new/yast2-iscsi-client-2.18.5/configure.in 2009-03-10 10:22:00.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-iscsi-client, 2.18.3, http://bugs.opensuse.org/, yast2-iscsi-client) +AC_INIT(yast2-iscsi-client, 2.18.4, http://bugs.opensuse.org/, yast2-iscsi-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.18.3" +VERSION="2.18.4" RPMNAME="yast2-iscsi-client" MAINTAINER="Michal Zugec <mzugec(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.4/src/IscsiClientLib.ycp new/yast2-iscsi-client-2.18.5/src/IscsiClientLib.ycp --- old/yast2-iscsi-client-2.18.4/src/IscsiClientLib.ycp 2009-01-19 16:50:09.000000000 +0100 +++ new/yast2-iscsi-client-2.18.5/src/IscsiClientLib.ycp 2009-03-10 10:19:07.000000000 +0100 @@ -24,6 +24,18 @@ // map used for autoYaST global map ay_settings=nil; + + +global map<string, any> hidePassword(map<string, any> orig){ + map<string, any> hidden=$[]; + foreach(string key, any value, orig, { + if (issubstring(key, "PASS")) value="*****"; + hidden[key]=value; + }); + return hidden; +} + + /** * get iBFT (available only on some special hardware) */ @@ -37,7 +49,7 @@ if (size(key_val[0]:"")>0) ibft[key_val[0]:""] = key_val[1]:""; }); } - y2milestone("iBFT %1", ibft); + y2milestone("iBFT %1", hidePassword(ibft)); y2milestone("Autologin into iBFT : %1", SCR::Execute(.target.bash_output, "iscsiadm -m fw -l")); return ibft; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.4/src/widgets.ycp new/yast2-iscsi-client-2.18.5/src/widgets.ycp --- old/yast2-iscsi-client-2.18.4/src/widgets.ycp 2009-02-24 12:23:29.000000000 +0100 +++ new/yast2-iscsi-client-2.18.5/src/widgets.ycp 2009-03-10 10:18:35.000000000 +0100 @@ -296,7 +296,7 @@ // ***************** iBFT table ************************** void initiBFT(string key){ list<term> items = []; - foreach(string key, any value, IscsiClientLib::getiBFT(), { + foreach(string key, any value, IscsiClientLib::hidePassword(IscsiClientLib::getiBFT()), { items = add(items, `item(`id(size(items)), key, value)); }); UI::ChangeWidget(`bios, `Items, items); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-iscsi-client-2.18.4/VERSION new/yast2-iscsi-client-2.18.5/VERSION --- old/yast2-iscsi-client-2.18.4/VERSION 2009-03-06 09:25:11.000000000 +0100 +++ new/yast2-iscsi-client-2.18.5/VERSION 2009-03-10 10:24:09.000000000 +0100 @@ -1 +1 @@ -2.18.4 +2.18.5 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 OpenOffice_org-components for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package OpenOffice_org-components for openSUSE:Factory checked in at Wed Mar 11 20:46:17 CET 2009. -------- --- OpenOffice_org-components/OpenOffice_org-components.changes 2009-02-20 15:18:58.000000000 +0100 +++ OpenOffice_org-components/OpenOffice_org-components.changes 2009-03-10 12:01:29.000000000 +0100 @@ -1,0 +2,6 @@ +Tue Mar 10 12:00:11 CET 2009 - pmladek(a)suse.cz + +- updated to the milestone ooo310-m4 +- updated ooo-build to version 3.0.99.1 (3.1-beta1) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- ooo300-m9-components.tar.bz2 New: ---- ooo310-m4-components.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ OpenOffice_org-components.spec ++++++ --- /var/tmp/diff_new_pack.fB1441/_old 2009-03-11 20:43:13.000000000 +0100 +++ /var/tmp/diff_new_pack.fB1441/_new 2009-03-11 20:43:13.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package OpenOffice_org-components (Version 3.0.0.16) +# spec file for package OpenOffice_org-components (Version 3.0.99.1) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -19,9 +19,9 @@ Name: OpenOffice_org-components -Version: 3.0.0.16 -Release: 2 -%define ooo_build_version 3.0.0.16.1 +Version: 3.0.99.1 +Release: 1 +%define ooo_build_version 3.0.99.1 %define piece components #!BuildIgnore: OpenOffice_org BuildRequires: OpenOffice_org-artwork-devel = %version @@ -47,7 +47,7 @@ %endif %define ooo_prefix %_libdir %define ooo_home ooo3 -%define ooo_build_tag ooo300-m9 +%define ooo_build_tag ooo310-m4 License: Artistic License; BSD 3-Clause; GPL v2 or later; LaTeX Public License (LPPL); LGPL v2.1 or later; LGPL v3 only; MOZILLA PUBLIC LICENSE (MPL/NPL); X11/MIT Group: Productivity/Office/Suite AutoReqProv: on @@ -203,6 +203,9 @@ %ooo_prefix/%ooo_home/solver/noarch %changelog +* Tue Mar 10 2009 pmladek(a)suse.cz +- updated to the milestone ooo310-m4 +- updated ooo-build to version 3.0.99.1 (3.1-beta1) * Fri Feb 20 2009 pmladek(a)suse.cz - updated ooo-build to version 3.0.0.16.1 * Fri Feb 06 2009 pmladek(a)suse.cz ++++++ ooo300-m9-components.tar.bz2 -> ooo310-m4-components.tar.bz2 ++++++ ++++ 100425 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

commit gucharmap for openSUSE:Factory
by root＠Hilbert.suse.de 11 Mar '09

11 Mar '09

Hello community, here is the log from the commit of package gucharmap for openSUSE:Factory checked in at Wed Mar 11 20:43:03 CET 2009. -------- --- GNOME/gucharmap/gucharmap.changes 2009-02-17 06:49:29.000000000 +0100 +++ gucharmap/gucharmap.changes 2009-03-09 14:02:18.000000000 +0100 @@ -1,0 +2,6 @@ +Mon Mar 9 13:23:13 CET 2009 - vuntz(a)novell.com + +- Add back scrollkeeper BuildRequires since some translations were + not ported to gnome-doc-utils. + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gucharmap.spec ++++++ --- /var/tmp/diff_new_pack.O22571/_old 2009-03-11 20:40:12.000000000 +0100 +++ /var/tmp/diff_new_pack.O22571/_new 2009-03-11 20:40:12.000000000 +0100 @@ -26,11 +26,12 @@ BuildRequires: gconf2-devel BuildRequires: gtk2-devel BuildRequires: python-gtk-devel +BuildRequires: scrollkeeper BuildRequires: update-desktop-files License: GPL v2 or later; LGPL v2.1 or later Group: System/GUI/GNOME Version: 2.25.91 -Release: 1 +Release: 2 Summary: A Feature-Rich Unicode Character Map Source: %{name}-%{version}.tar.bz2 Url: http://gucharmap.sourceforge.net/ @@ -118,6 +119,9 @@ %{_datadir}/gtk-doc/html/* %changelog +* Mon Mar 09 2009 vuntz(a)novell.com +- Add back scrollkeeper BuildRequires since some translations were + not ported to gnome-doc-utils. * Tue Feb 17 2009 mboman(a)suse.de - Merge omf/gucharmap back to main packages. Makes no sense to have a separate -doc package only for this. ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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