Hello community,

here is the log from the commit of package yast2-ncurses-pkg for 
openSUSE:Factory checked in at 2012-03-09 21:29:41
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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 "g...@suse.com"

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-ncurses-pkg/yast2-ncurses-pkg.changes      
2012-03-02 13:50:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.yast2-ncurses-pkg.new/yast2-ncurses-pkg.changes 
2012-03-09 21:29:47.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar  6 13:25:45 CET 2012 - g...@suse.de
+
+- Better formatting also for notify messages (bnc #746876)
+- 2.22.2 
+
+-------------------------------------------------------------------
@@ -4 +10 @@
-- Better formatting of package and patch descriptions
+- Better formatting of package and patch descriptions (bnc #691572)

Old:
----
  yast2-ncurses-pkg-2.22.1.tar.bz2

New:
----
  yast2-ncurses-pkg-2.22.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-ncurses-pkg.spec ++++++
--- /var/tmp/diff_new_pack.GB81Ph/_old  2012-03-09 21:29:51.000000000 +0100
+++ /var/tmp/diff_new_pack.GB81Ph/_new  2012-03-09 21:29:51.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package yast2-ncurses-pkg
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 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,16 +18,17 @@
 
 
 Name:           yast2-ncurses-pkg
-Version:        2.22.1
+Version:        2.22.2
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Source0:        yast2-ncurses-pkg-%{version}.tar.bz2
 
+
 Group:          System/YaST
 License:        GPL-2.0
-BuildRequires:  dejagnu doxygen gcc-c++ libtool yast2-core-devel yast2-devtools
-BuildRequires:  blocxx-devel libxcrypt-devel ncurses-devel yast2-ncurses-devel
+BuildRequires: doxygen dejagnu gcc-c++ yast2-core-devel yast2-devtools libtool
+BuildRequires: libxcrypt-devel blocxx-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.1.tar.bz2 -> yast2-ncurses-pkg-2.22.2.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.1/VERSION 
new/yast2-ncurses-pkg-2.22.2/VERSION
--- old/yast2-ncurses-pkg-2.22.1/VERSION        2012-03-01 14:34:03.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.2/VERSION        2012-03-07 12:19:59.000000000 
+0100
@@ -1 +1 @@
-2.22.1
+2.22.2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.1/configure 
new/yast2-ncurses-pkg-2.22.2/configure
--- old/yast2-ncurses-pkg-2.22.1/configure      2012-03-01 14:36:23.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.2/configure      2012-03-07 12:20:50.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.1.
+# Generated by GNU Autoconf 2.68 for yast2-ncurses-pkg 2.22.2.
 #
 # 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.1'
-PACKAGE_STRING='yast2-ncurses-pkg 2.22.1'
+PACKAGE_VERSION='2.22.2'
+PACKAGE_STRING='yast2-ncurses-pkg 2.22.2'
 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.1 to adapt to many kinds of 
systems.
+\`configure' configures yast2-ncurses-pkg 2.22.2 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.1:";;
+     short | recursive ) echo "Configuration of yast2-ncurses-pkg 2.22.2:";;
    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.1
+yast2-ncurses-pkg configure 2.22.2
 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.1, which was
+It was created by yast2-ncurses-pkg $as_me 2.22.2, 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.1'
+ VERSION='2.22.2'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3276,7 +3276,7 @@
 
 
 
-VERSION="2.22.1"
+VERSION="2.22.2"
 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.22.1, which was
+This file was extended by yast2-ncurses-pkg $as_me 2.22.2, 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.1
+yast2-ncurses-pkg config.status 2.22.2
 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.1/configure.in 
new/yast2-ncurses-pkg-2.22.2/configure.in
--- old/yast2-ncurses-pkg-2.22.1/configure.in   2012-03-01 14:36:14.000000000 
+0100
+++ new/yast2-ncurses-pkg-2.22.2/configure.in   2012-03-07 12:20:42.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.1, http://bugs.opensuse.org/, 
yast2-ncurses-pkg)
+AC_INIT(yast2-ncurses-pkg, 2.22.2, 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.1"
+VERSION="2.22.2"
 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.22.1/src/NCPkgPackageDetails.cc 
new/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc
--- old/yast2-ncurses-pkg-2.22.1/src/NCPkgPackageDetails.cc     2012-03-01 
14:32:42.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.2/src/NCPkgPackageDetails.cc     2012-03-07 
12:31:27.000000000 +0100
@@ -92,7 +92,10 @@
        {
            if ( oneline && i < 999 )
            {
-               text += ", ";
+                if ( boost::ends_with( text, ":" ) )
+                    text += " ";
+                else
+                    text += ", ";
            }
            else
            {
@@ -179,7 +182,15 @@
     text += pkgPtr->installSize().asString();
     text +=  "  ";
 
-    ZyppPkg package = tryCastToZyppPkg (pkgPtr);
+    ZyppPkg package;
+    ZyppPkg candidate = tryCastToZyppPkg( slbPtr->candidateObj() );
+    ZyppPkg installed = tryCastToZyppPkg( slbPtr->installedObj() );
+
+    if ( installed )
+        package = installed;
+    else
+        package = candidate;
+
     if ( package )
     {
         // add the media nr
@@ -211,11 +222,15 @@
         list<string> authors = package->authors(); // zypp::Package
         if ( !authors.empty() )
         {
+            string author_text;
             text += NCPkgStrings::Authors();  
             //authors, in one line
-            text += createText( authors, true );
+            author_text = createText( authors, true );
+            // escape html
+            boost::replace_all( author_text, "<", "&lt;" );
+            boost::replace_all( author_text, ">", "&gt;" );
+            text += author_text;
         }
-
     }
 
     setValue (text);
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/yast2-ncurses-pkg-2.22.1/src/NCPkgTable.cc 
new/yast2-ncurses-pkg-2.22.2/src/NCPkgTable.cc
--- old/yast2-ncurses-pkg-2.22.1/src/NCPkgTable.cc      2012-02-22 
09:40:43.000000000 +0100
+++ new/yast2-ncurses-pkg-2.22.2/src/NCPkgTable.cc      2012-03-06 
13:19:10.000000000 +0100
@@ -300,9 +300,10 @@
 
     if ( ok && !notify.empty() )
     {
+        string html_text = packager->InfoText()->createHtmlText( notify );
        NCPopupInfo * info = new NCPopupInfo( wpos( (lines * 35)/100, (cols * 
25)/100),
                                              header,
-                                             "<i>" + pkgName + "</i><br><br>" 
+ notify
+                                             "<i>" + pkgName + "</i><br><br>" 
+ html_text
                                              );
        info->setPreferredSize( (NCurses::cols() * 50)/100, (NCurses::lines() * 
30)/100);
        info->showInfoPopup( );

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org

Reply via email to