Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at Thu Aug 4 09:24:03 CEST 2011.
-------- --- yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2011-04-26 11:17:10.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2011-08-02 20:01:14.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Aug 2 17:32:01 UTC 2011 - lsle...@suse.cz + +- added new ignoreAlreadyRecommended solver option to + the dependencies submenu (bnc#668588) +- 2.21.1 + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- yast2-ncurses-pkg-2.21.0.tar.bz2 New: ---- yast2-ncurses-pkg-2.21.1.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.opcTu5/_old 2011-08-04 09:23:27.000000000 +0200 +++ /var/tmp/diff_new_pack.opcTu5/_new 2011-08-04 09:23:27.000000000 +0200 @@ -19,16 +19,16 @@ Name: yast2-ncurses-pkg -Version: 2.21.0 +Version: 2.21.1 Release: 1 BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ncurses-pkg-2.21.0.tar.bz2 +Source0: yast2-ncurses-pkg-2.21.1.tar.bz2 Prefix: /usr Group: System/YaST -License: GPLv2+ +License: GPL v2 or later BuildRequires: dejagnu doxygen gcc-c++ yast2-core-devel yast2-devtools BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel @@ -49,7 +49,7 @@ package manager %prep -%setup -n yast2-ncurses-pkg-2.21.0 +%setup -n yast2-ncurses-pkg-2.21.1 %build %{prefix}/bin/y2tool y2autoconf ++++++ yast2-ncurses-pkg-2.21.0.tar.bz2 -> yast2-ncurses-pkg-2.21.1.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/VERSION new/yast2-ncurses-pkg-2.21.1/VERSION --- old/yast2-ncurses-pkg-2.21.0/VERSION 2011-04-26 11:08:50.000000000 +0200 +++ new/yast2-ncurses-pkg-2.21.1/VERSION 2011-08-02 19:42:58.000000000 +0200 @@ -1 +1 @@ -2.21.0 +2.21.1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/configure new/yast2-ncurses-pkg-2.21.1/configure --- old/yast2-ncurses-pkg-2.21.0/configure 2011-04-26 11:15:39.000000000 +0200 +++ new/yast2-ncurses-pkg-2.21.1/configure 2011-08-02 19:58:21.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.21.0. +# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.21.1. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -709,8 +709,8 @@ # Identity of this package. PACKAGE_NAME='yast2-ncurses-pkg' PACKAGE_TARNAME='yast2-ncurses-pkg' -PACKAGE_VERSION='2.21.0' -PACKAGE_STRING='yast2-ncurses-pkg 2.21.0' +PACKAGE_VERSION='2.21.1' +PACKAGE_STRING='yast2-ncurses-pkg 2.21.1' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' PACKAGE_URL='' @@ -1492,7 +1492,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-ncurses-pkg 2.21.0 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.21.1 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1564,7 +1564,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.21.0:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.21.1:";; esac cat <<\_ACEOF @@ -1680,7 +1680,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2-ncurses-pkg configure 2.21.0 +yast2-ncurses-pkg configure 2.21.1 generated by GNU Autoconf 2.68 Copyright (C) 2010 Free Software Foundation, Inc. @@ -2224,7 +2224,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-ncurses-pkg $as_me 2.21.0, which was +It was created by yast2-ncurses-pkg $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was $ $0 $@ @@ -3154,7 +3154,7 @@ # Define the identity of the package. PACKAGE='yast2-ncurses-pkg' - VERSION='2.21.0' + VERSION='2.21.1' cat >>confdefs.h <<_ACEOF @@ -3276,7 +3276,7 @@ -VERSION="2.21.0" +VERSION="2.21.1" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <g...@suse.de>" @@ -16076,7 +16076,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2-ncurses-pkg $as_me 2.21.0, which was +This file was extended by yast2-ncurses-pkg $as_me 2.21.1, which was generated by GNU Autoconf 2.68. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -16142,7 +16142,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -yast2-ncurses-pkg config.status 2.21.0 +yast2-ncurses-pkg config.status 2.21.1 configured by $0, generated by GNU Autoconf 2.68, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/configure.in new/yast2-ncurses-pkg-2.21.1/configure.in --- old/yast2-ncurses-pkg-2.21.0/configure.in 2011-04-26 11:15:32.000000000 +0200 +++ new/yast2-ncurses-pkg-2.21.1/configure.in 2011-08-02 19:58:16.000000000 +0200 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.18.11 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.21.0, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.21.1, http://bugs.opensuse.org/, yast2-ncurses-pkg) 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.21.0" +VERSION="2.21.1" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <g...@suse.de>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.21.1/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.21.0/src/NCPackageSelector.cc 2011-02-03 13:06:40.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.1/src/NCPackageSelector.cc 2011-08-02 11:44:01.000000000 +0200 @@ -207,6 +207,16 @@ return zypp::getZYpp()->resolver()->setCleandepsOnRemove( on ); } +bool NCPackageSelector::isIgnoreAlreadyRecommended() +{ + return zypp::getZYpp()->resolver()->ignoreAlreadyRecommended(); +} + +void NCPackageSelector::setIgnoreAlreadyRecommended( bool on ) +{ + return zypp::getZYpp()->resolver()->setIgnoreAlreadyRecommended( on ); +} + bool NCPackageSelector::isVerifySystem( ) { return zypp::getZYpp()->resolver()->systemVerification(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.21.1/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.21.0/src/NCPackageSelector.h 2011-02-03 13:01:15.000000000 +0100 +++ new/yast2-ncurses-pkg-2.21.1/src/NCPackageSelector.h 2011-08-02 11:42:46.000000000 +0200 @@ -290,6 +290,9 @@ bool isCleanDepsOnRemove(); void setCleanDepsOnRemove( bool on ); + bool isIgnoreAlreadyRecommended(); + void setIgnoreAlreadyRecommended( bool on ); + bool isAllowVendorChange(); void setAllowVendorChange( bool on ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/src/NCPkgMenuDeps.cc new/yast2-ncurses-pkg-2.21.1/src/NCPkgMenuDeps.cc --- old/yast2-ncurses-pkg-2.21.0/src/NCPkgMenuDeps.cc 2010-10-21 14:00:49.000000000 +0200 +++ new/yast2-ncurses-pkg-2.21.1/src/NCPkgMenuDeps.cc 2011-08-02 11:52:53.000000000 +0200 @@ -62,6 +62,10 @@ verifySystem = new YMenuItem( NO_CHECK_BOX + _("&Verify System Now") ); items.push_back( verifySystem ); + ignoreAlreadyRecommendedOpt = new YMenuItem( CHECK_BOX + _("&Ignore Recommended Packages for Already Installed Packages") ); + items.push_back( ignoreAlreadyRecommendedOpt ); + setSelected( ignoreAlreadyRecommendedOpt, pkg->isIgnoreAlreadyRecommended() ); + verifySystemOpt = new YMenuItem( CHECK_BOX + _("&System Verification Mode") ); items.push_back( verifySystemOpt ); @@ -94,6 +98,8 @@ return setVerifySystem(); else if (event.selection == cleanDepsOnRemove ) return setCleanDepsOnRemove(); + else if (event.selection == ignoreAlreadyRecommendedOpt ) + return setIgnoreAlreadyRecommended(); else if (event.selection == allowVendorChange ) return setAllowVendorChange(); else if (event.selection == testCase) @@ -177,6 +183,15 @@ return true; } +bool NCPkgMenuDeps::setIgnoreAlreadyRecommended() +{ + pkg->setIgnoreAlreadyRecommended( !pkg->isIgnoreAlreadyRecommended() ); + setSelected( ignoreAlreadyRecommendedOpt, pkg->isIgnoreAlreadyRecommended() ); + + return true; +} + + bool NCPkgMenuDeps::setAllowVendorChange() { pkg->setAllowVendorChange( !pkg->isAllowVendorChange() ); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.21.0/src/NCPkgMenuDeps.h new/yast2-ncurses-pkg-2.21.1/src/NCPkgMenuDeps.h --- old/yast2-ncurses-pkg-2.21.0/src/NCPkgMenuDeps.h 2010-10-21 14:00:49.000000000 +0200 +++ new/yast2-ncurses-pkg-2.21.1/src/NCPkgMenuDeps.h 2011-08-02 11:50:43.000000000 +0200 @@ -44,6 +44,7 @@ YMenuItem *checkNow; YMenuItem *verifySystem; YMenuItem *verifySystemOpt; + YMenuItem *ignoreAlreadyRecommendedOpt; YMenuItem *cleanDepsOnRemove; YMenuItem *allowVendorChange; YMenuItem *testCase; @@ -63,6 +64,8 @@ bool setCleanDepsOnRemove(); + bool setIgnoreAlreadyRecommended(); + bool setAllowVendorChange(); bool setVerifySystem(); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org