Hello community,
here is the log from the commit of package libyui-ncurses-pkg for
openSUSE:Factory checked in at 2013-01-24 10:26:03
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libyui-ncurses-pkg (Old)
and /work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libyui-ncurses-pkg", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/libyui-ncurses-pkg/libyui-ncurses-pkg.changes
2013-01-10 13:12:57.000000000 +0100
+++
/work/SRC/openSUSE:Factory/.libyui-ncurses-pkg.new/libyui-ncurses-pkg.changes
2013-01-24 10:26:05.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Jan 22 11:43:43 CET 2013 - [email protected]
+
+- Bug-fix for package search (concerning package summary)
+- V 2.43.3
+
+-------------------------------------------------------------------
Old:
----
libyui-ncurses-pkg-2.43.2.tar.bz2
New:
----
libyui-ncurses-pkg-2.43.3.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libyui-ncurses-pkg-doc.spec ++++++
--- /var/tmp/diff_new_pack.bWxEzi/_old 2013-01-24 10:26:08.000000000 +0100
+++ /var/tmp/diff_new_pack.bWxEzi/_new 2013-01-24 10:26:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.43.2)
+# spec file for package libyui-ncurses-pkg (Version 2.43.3)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -16,7 +16,7 @@
#
Name: libyui-ncurses-pkg-doc
-Version: 2.43.2
+Version: 2.43.3
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
++++++ libyui-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.bWxEzi/_old 2013-01-24 10:26:08.000000000 +0100
+++ /var/tmp/diff_new_pack.bWxEzi/_new 2013-01-24 10:26:08.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package libyui-ncurses-pkg (Version 2.43.2)
+# spec file for package libyui-ncurses-pkg (Version 2.43.3)
#
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -18,7 +18,7 @@
# norootforbuild
Name: libyui-ncurses-pkg
-Version: 2.43.2
+Version: 2.43.3
Release: 0
License: LGPL-2.1 or LGPL-3.0
Source: libyui-ncurses-pkg-%{version}.tar.bz2
++++++ libyui-ncurses-pkg-2.43.2.tar.bz2 -> libyui-ncurses-pkg-2.43.3.tar.bz2
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.2/ChangeLog
new/libyui-ncurses-pkg-2.43.3/ChangeLog
--- old/libyui-ncurses-pkg-2.43.2/ChangeLog 2013-01-09 12:23:11.000000000
+0100
+++ new/libyui-ncurses-pkg-2.43.3/ChangeLog 2013-01-22 12:58:21.000000000
+0100
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Tue Jan 22 11:43:43 CET 2013 - [email protected]
+
+- Bug-fix for package search (concerning package summary)
+- V 2.43.3
+
+-------------------------------------------------------------------
Wed Dec 12 11:05:08 CET 2012 - [email protected]
- Improve help text for recommended packages, fix typos
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.2/VERSION.cmake
new/libyui-ncurses-pkg-2.43.3/VERSION.cmake
--- old/libyui-ncurses-pkg-2.43.2/VERSION.cmake 2013-01-09 12:23:11.000000000
+0100
+++ new/libyui-ncurses-pkg-2.43.3/VERSION.cmake 2013-01-22 12:58:21.000000000
+0100
@@ -1,6 +1,6 @@
SET( VERSION_MAJOR "2" )
SET( VERSION_MINOR "43" )
-SET( VERSION_PATCH "2" )
+SET( VERSION_PATCH "3" )
SET( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
##### This is need for the libyui core, ONLY.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.2/src/NCPkgFilterSearch.cc
new/libyui-ncurses-pkg-2.43.3/src/NCPkgFilterSearch.cc
--- old/libyui-ncurses-pkg-2.43.2/src/NCPkgFilterSearch.cc 2013-01-09
12:23:11.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.3/src/NCPkgFilterSearch.cc 2013-01-22
12:58:21.000000000 +0100
@@ -182,13 +182,7 @@
bool NCPkgFilterSearch::fillSearchList( std::string & expr,
- bool ignoreCase,
- bool checkName,
- bool checkKeywords,
- bool checkSummary,
- bool checkDescr,
- bool checkProvides,
- bool checkRequires )
+ bool ignoreCase )
{
NCPkgTable * packageList = packager->PackageList();
@@ -200,6 +194,7 @@
// clear the package table
packageList->itemsCleared ();
+ NCPkgSearchSettings *settings = packager->SearchSettings();
zypp::PoolQuery q;
switch ( searchMode->getCurrentItem() )
@@ -227,18 +222,19 @@
if ( !ignoreCase )
q.setCaseSensitive();
- if ( checkName )
+ if ( settings->doCheckName() )
q.addAttribute( zypp::sat::SolvAttr::name );
- if ( checkSummary )
+ if ( settings->doCheckSummary() )
q.addAttribute( zypp::sat::SolvAttr::summary );
- if ( checkKeywords )
+ if ( settings->doCheckKeywords() )
q.addAttribute( zypp::sat::SolvAttr::keywords );
- if ( checkDescr )
+ if ( settings->doCheckDescr() )
q.addAttribute( zypp::sat::SolvAttr::description );
- if ( checkProvides )
- q.addAttribute( zypp::sat::SolvAttr("solvable:provides") );
- if ( checkRequires )
- q.addAttribute( zypp::sat::SolvAttr("solvable:requires") );
+ if ( settings->doCheckProvides() )
+ q.addAttribute( zypp::sat::SolvAttr::provides );
+ if ( settings->doCheckRequires() )
+ // attribute SolvAttr::requires means "required by"
+ q.addAttribute( zypp::sat::SolvAttr::requires );
NCPopupInfo * info = new NCPopupInfo( wpos( (NCurses::lines()-4)/2,
(NCurses::cols()-18)/2 ),
"",
@@ -305,20 +301,12 @@
//
bool NCPkgFilterSearch::showSearchResultPackages()
{
- NCPkgSearchSettings *settings = packager->SearchSettings();
std::string filter = getSearchExpression();
if ( !packager->isYouMode() )
{
// fill the package list with packages matching the search expression
- fillSearchList( filter, getCheckBoxValue( ignoreCase ),
- settings->doCheckName(),
- settings->doCheckSummary(),
- settings->doCheckKeywords(),
- settings->doCheckDescr(),
- settings->doCheckProvides(),
- settings->doCheckRequires()
- );
+ fillSearchList( filter, getCheckBoxValue( ignoreCase ) );
}
return true;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.2/src/NCPkgFilterSearch.h
new/libyui-ncurses-pkg-2.43.3/src/NCPkgFilterSearch.h
--- old/libyui-ncurses-pkg-2.43.2/src/NCPkgFilterSearch.h 2013-01-09
12:23:11.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.3/src/NCPkgFilterSearch.h 2013-01-22
12:58:21.000000000 +0100
@@ -101,14 +101,8 @@
virtual bool showSearchResultPackages();
bool match ( std::string s1, std::string s2, bool ignoreCase );
- bool fillSearchList( std::string & expr,
- bool ignoreCase,
- bool checkName,
- bool checkKeywords,
- bool checkSummary,
- bool checkDescr,
- bool checkProvides,
- bool checkRequires );
+
+ bool fillSearchList( std::string & expr, bool ignoreCase );
NCInputField * getSearchField() { return searchExpr; }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/libyui-ncurses-pkg-2.43.2/src/NCPkgSearchSettings.cc
new/libyui-ncurses-pkg-2.43.3/src/NCPkgSearchSettings.cc
--- old/libyui-ncurses-pkg-2.43.2/src/NCPkgSearchSettings.cc 2013-01-09
12:23:11.000000000 +0100
+++ new/libyui-ncurses-pkg-2.43.3/src/NCPkgSearchSettings.cc 2013-01-22
12:58:21.000000000 +0100
@@ -69,7 +69,7 @@
items.push_back (checkDescr);
checkProvides = new YItem ( _( "Provides" ));
items.push_back (checkProvides);
- checkRequires = new YItem ( _( "Requires" ));
+ checkRequires = new YItem ( _( "Required by" ));
items.push_back (checkRequires);
addItems( items );
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
