Hello community, here is the log from the commit of package yast2-ncurses-pkg for openSUSE:Factory checked in at 2012-03-19 10:07:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/yast2-ncurses-pkg (Old) and /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "yast2-ncurses-pkg", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes 2012-03-09 21:29:47.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes 2012-03-19 10:07:50.000000000 +0100 @@ -1,0 +2,7 @@ +Wed Mar 14 13:42:38 CET 2012 - [email protected] + +- Online Update: possibility to search in patch summary, improve + formatting of patch descriptions +- 2.22.3 + +------------------------------------------------------------------- Old: ---- yast2-ncurses-pkg-2.22.2.tar.bz2 New: ---- yast2-ncurses-pkg-2.22.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ncurses-pkg.spec ++++++ --- /var/tmp/diff_new_pack.tYZUM5/_old 2012-03-19 10:07:53.000000000 +0100 +++ /var/tmp/diff_new_pack.tYZUM5/_new 2012-03-19 10:07:53.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package yast2-ncurses-pkg # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 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 @@ -18,17 +18,16 @@ Name: yast2-ncurses-pkg -Version: 2.22.2 +Version: 2.22.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: yast2-ncurses-pkg-%{version}.tar.bz2 - Group: System/YaST License: GPL-2.0 -BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libtool -BuildRequires: libxcrypt-devel blocxx-devel ncurses-devel yast2-ncurses-devel +BuildRequires: dejagnu doxygen gcc-c++ libtool yast2-core-devel yast2-devtools +BuildRequires: blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel Summary: YaST2 - Character Based Package Manager Frontend Provides: yast2-ncurses:%{_libdir}/YaST2/plugin/libpy2ncurses.so ++++++ yast2-ncurses-pkg-2.22.2.tar.bz2 -> yast2-ncurses-pkg-2.22.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/VERSION new/yast2-ncurses-pkg-2.22.3/VERSION --- old/yast2-ncurses-pkg-2.22.2/VERSION 2012-03-07 12:19:59.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/VERSION 2012-03-14 14:26:37.000000000 +0100 @@ -1 +1 @@ -2.22.2 +2.22.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/configure new/yast2-ncurses-pkg-2.22.3/configure --- old/yast2-ncurses-pkg-2.22.2/configure 2012-03-07 12:20:50.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/configure 2012-03-14 14:27:04.000000000 +0100 @@ -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.22.2. +# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.3. # # 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.22.2' -PACKAGE_STRING='yast2-ncurses-pkg 2.22.2' +PACKAGE_VERSION='2.22.3' +PACKAGE_STRING='yast2-ncurses-pkg 2.22.3' 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.22.2 to adapt to many kinds of systems. +\`configure' configures yast2-ncurses-pkg 2.22.3 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.22.2:";; + short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.3:";; 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.22.2 +yast2-ncurses-pkg configure 2.22.3 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.22.2, which was +It was created by yast2-ncurses-pkg $as_me 2.22.3, 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.22.2' + VERSION='2.22.3' cat >>confdefs.h <<_ACEOF @@ -3276,7 +3276,7 @@ -VERSION="2.22.2" +VERSION="2.22.3" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <[email protected]>" @@ -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.22.2, which was +This file was extended by yast2-ncurses-pkg $as_me 2.22.3, 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.22.2 +yast2-ncurses-pkg config.status 2.22.3 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.22.2/configure.in new/yast2-ncurses-pkg-2.22.3/configure.in --- old/yast2-ncurses-pkg-2.22.2/configure.in 2012-03-07 12:20:42.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/configure.in 2012-03-14 14:26:56.000000000 +0100 @@ -3,7 +3,7 @@ dnl -- This file is generated by y2autoconf 2.21.2 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2-ncurses-pkg, 2.22.2, http://bugs.opensuse.org/, yast2-ncurses-pkg) +AC_INIT(yast2-ncurses-pkg, 2.22.3, 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.22.2" +VERSION="2.22.3" RPMNAME="yast2-ncurses-pkg" MAINTAINER="Gabriele Mohr <[email protected]>" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.cc new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.cc 2012-02-22 14:10:13.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.cc 2012-03-14 13:39:51.000000000 +0100 @@ -380,7 +380,7 @@ // // Fills the patch list with search results // -bool NCPackageSelector::fillPatchSearchList( const string & expr ) +bool NCPackageSelector::fillPatchSearchList( const string & expr, bool checkName, bool checkSum ) { NCPkgTable * packageList = PackageList(); @@ -396,7 +396,14 @@ q.addString( expr ); q.addKind( zypp::ResKind::patch ); q.addAttribute( zypp::sat::SolvAttr::keywords ); - q.addAttribute( zypp::sat::SolvAttr::name ); + if ( checkName ) + { + q.addAttribute( zypp::sat::SolvAttr::name ); + } + if ( checkSum ) + { + q.addAttribute( zypp::sat::SolvAttr::summary ); + } for( zypp::PoolQuery::Selectable_iterator it = q.selectableBegin(); it != q.selectableEnd(); it++) @@ -1343,7 +1350,7 @@ NCPopupInfo * info = new NCPopupInfo ( wpos( NCurses::lines()/10, NCurses::cols()/10), // headline of a popup showing the package license - string( _("End User License Agreement") ), + _("End User License Agreement"), "<i>" + pkgName + "</i><br><br>" + html_text, NCPkgStrings::AcceptLabel(), diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.h new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.h --- old/yast2-ncurses-pkg-2.22.2/src/NCPackageSelector.h 2012-02-28 14:59:33.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPackageSelector.h 2012-03-14 13:30:23.000000000 +0100 @@ -300,7 +300,7 @@ * @param checkRequires Check in Requires (true or false) * @return bool */ - bool fillPatchSearchList( const string & expr ); + bool fillPatchSearchList( const string & expr, bool checkName, bool checkSum ); bool fillDefaultList(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgFilterSearch.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgFilterSearch.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgFilterSearch.cc 2012-01-17 13:30:58.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgFilterSearch.cc 2012-03-14 13:35:34.000000000 +0100 @@ -321,10 +321,6 @@ settings->doCheckRequires() ); } - else - { - packager->fillPatchSearchList( filter ); - } return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgPackageDetails.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc 2012-03-07 12:31:27.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPackageDetails.cc 2012-03-14 11:30:33.000000000 +0100 @@ -182,13 +182,13 @@ text += pkgPtr->installSize().asString(); text += " "; - ZyppPkg package; + ZyppPkg package = tryCastToZyppPkg( pkgPtr ); ZyppPkg candidate = tryCastToZyppPkg( slbPtr->candidateObj() ); ZyppPkg installed = tryCastToZyppPkg( slbPtr->installedObj() ); if ( installed ) package = installed; - else + else if ( candidate ) package = candidate; if ( package ) @@ -415,8 +415,19 @@ // get and format the patch description string value = patchPtr->description(); + string html_text = ""; + const string htmlIdent(DOCTYPETAG); + + if ( value.find( htmlIdent ) != string::npos ) + { + html_text = value; // HTML text + } + else + { + html_text = "<pre>" + value + "</pre>"; // add <pre> to preserve newlines and spaces + } - descr += createHtmlText( value ); + descr += html_text; descr += _("References:<br>"); for ( Patch::ReferenceIterator rit = patchPtr->referencesBegin(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.cc new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.cc --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.cc 2012-01-17 13:31:54.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.cc 2012-03-14 13:33:53.000000000 +0100 @@ -70,7 +70,7 @@ , searchExpr( 0 ) , packager( pkger ) { - createLayout( _("Search for Patch Name") ); + createLayout( _("Search for Patches") ); } /////////////////////////////////////////////////////////////////// @@ -117,8 +117,16 @@ new NCSpacing( vSplit, YD_VERT, false, 0.6 ); + NCMultiSelectionBox * settings = new NCMultiSelectionBox( vSplit, NCPkgStrings::SearchIn() ); + YItemCollection items; + searchName = new YItem ( _( "Name of the Patch" ), true); + items.push_back( searchName ); + searchSum = new YItem ( _( "Summary" ), true); + items.push_back( searchSum ); + settings->addItems( items ); + + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); NCLayoutBox * hSplit3 = new NCLayoutBox( vSplit, YD_HORIZ ); - new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); // add the cancel and the ok button @@ -131,7 +139,7 @@ cancelButton->setFunctionKey( 9 ); new NCSpacing( hSplit3, YD_HORIZ, true, 0.2 ); - + new NCSpacing( vSplit, YD_VERT, false, 0.6 ); } /////////////////////////////////////////////////////////////////// @@ -200,7 +208,7 @@ // int NCPkgPatchSearch::preferredHeight() { - return 10; + return 16; } /////////////////////////////////////////////////////////////////// @@ -248,8 +256,9 @@ postevent.result = getSearchExpression(); string filter = postevent.result; - - packager->fillPatchSearchList( filter ); + bool checkName = searchName->selected(); + bool checkSum = searchSum->selected(); + packager->fillPatchSearchList( filter, checkName, checkSum ); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.h new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.h --- old/yast2-ncurses-pkg-2.22.2/src/NCPkgPatchSearch.h 2012-01-17 13:28:12.000000000 +0100 +++ new/yast2-ncurses-pkg-2.22.3/src/NCPkgPatchSearch.h 2012-03-14 13:16:24.000000000 +0100 @@ -70,6 +70,9 @@ private: NCComboBox * searchExpr; + + YItem * searchName; + YItem * searchSum; NCPushButton * cancelButton; NCPushButton * okButton; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
