commit yast2-ncurses

19 May 2006

Hello community,

here is the log from the commit of package yast2-ncurses
checked in at Fri May 19 16:57:58 CEST 2006.

--------

--- yast2-ncurses/yast2-ncurses.changes	2006-05-18 10:49:05.000000000 +0200
+++ yast2-ncurses/yast2-ncurses.changes	2006-05-19 14:20:38.000000000 +0200
@@ -1,0 +2,6 @@
+Fri May 19 14:19:18 CEST 2006 - gs@suse.de
+
+- Package Installation: Sort the pattern list (bug #176603)
+- 2.13.33
+
+-------------------------------------------------------------------

Old:
----
  yast2-ncurses-2.13.32.tar.bz2

New:
----
  yast2-ncurses-2.13.33.tar.bz2

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

Other differences:
------------------
++++++ yast2-ncurses.spec ++++++
--- /var/tmp/diff_new_pack.X6jbBw/_old	2006-05-19 16:56:36.000000000 +0200
+++ /var/tmp/diff_new_pack.X6jbBw/_new	2006-05-19 16:56:36.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package yast2-ncurses (Version 2.13.32)
+# spec file for package yast2-ncurses (Version 2.13.33)
 #
 # Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,12 +11,12 @@
 # norootforbuild
 
 Name:           yast2-ncurses
-Version:        2.13.32
+Version:        2.13.33
 Release:        1
 License:        GPL
 Group:          System/YaST
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source0:        yast2-ncurses-2.13.32.tar.bz2
+Source0:        yast2-ncurses-2.13.33.tar.bz2
 prefix:		/usr
 BuildRequires:  doxygen gcc-c++ libzypp-devel yast2-core-devel yast2-devtools
 BuildRequires:  blocxx-devel libxcrypt-devel
@@ -41,7 +41,7 @@
 
 
 %prep
-%setup -n yast2-ncurses-2.13.32
+%setup -n yast2-ncurses-2.13.33
 
 %build
 %{prefix}/bin/y2tool y2autoconf
@@ -74,6 +74,9 @@
 %doc %{prefix}/share/doc/packages/yast2-ncurses
 
 %changelog -n yast2-ncurses
+* Fri May 19 2006 - gs@suse.de
+- Package Installation: Sort the pattern list (bug #176603)
+- 2.13.33
 * Thu May 18 2006 - kkaempf@suse.de
 - adapt to libzypp 1.0.0 api
 - require libzypp >= 1.0.0

++++++ yast2-ncurses-2.13.32.tar.bz2 -> yast2-ncurses-2.13.33.tar.bz2 ++++++
++++    5219 lines of diff (skipped)
++++    retrying with extended exclude list
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.32/VERSION new/yast2-ncurses-2.13.33/VERSION
--- old/yast2-ncurses-2.13.32/VERSION	2006-05-18 10:10:50.000000000 +0200
+++ new/yast2-ncurses-2.13.33/VERSION	2006-05-19 14:19:07.000000000 +0200
@@ -1 +1 @@
-2.13.32
+2.13.33
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.32/configure.in new/yast2-ncurses-2.13.33/configure.in
--- old/yast2-ncurses-2.13.32/configure.in	2006-05-18 09:51:55.000000000 +0200
+++ new/yast2-ncurses-2.13.33/configure.in	2006-05-16 22:44:11.000000000 +0200
@@ -3,7 +3,7 @@
 dnl -- This file is generated by y2autoconf 2.13.19 - DO NOT EDIT! --
 dnl    (edit configure.in.in instead)
 
-AC_INIT(yast2-ncurses, 2.13.31, http://bugs.opensuse.org/, yast2-ncurses)
+AC_INIT(yast2-ncurses, 2.13.30, http://bugs.opensuse.org/, yast2-ncurses)
 dnl Check for presence of file 'RPMNAME'
 AC_CONFIG_SRCDIR([RPMNAME])
 
@@ -17,7 +17,7 @@
 AM_INIT_AUTOMAKE(tar-ustar) dnl searches for some needed programs
 
 dnl Important YaST2 variables
-VERSION="2.13.31"
+VERSION="2.13.30"
 RPMNAME="yast2-ncurses"
 MAINTAINER="Martin Lazar <mlazar@suse.cz>"
 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/yast2-ncurses-2.13.32/src/NCPopupSelection.cc new/yast2-ncurses-2.13.33/src/NCPopupSelection.cc
--- old/yast2-ncurses-2.13.32/src/NCPopupSelection.cc	2006-05-12 12:00:27.000000000 +0200
+++ new/yast2-ncurses-2.13.33/src/NCPopupSelection.cc	2006-05-19 14:25:07.000000000 +0200
@@ -264,7 +264,24 @@
 {
     ZyppSelection ptr1 = tryCastToZyppSelection (slb1->theObj());
     ZyppSelection ptr2 = tryCastToZyppSelection (slb2->theObj());
-    return ptr1->order() < ptr2->order();
+    if ( !ptr1 || !ptr2 )
+	return false;
+    else
+	return ptr1->order() < ptr2->order();
+}
+
+///////////////////////////////////////////////////////////////////
+//
+// OrderFuncPattern 
+//
+bool orderPattern( ZyppSel slb1, ZyppSel slb2 )
+{
+    ZyppPattern ptr1 = tryCastToZyppPattern (slb1->theObj());
+    ZyppPattern ptr2 = tryCastToZyppPattern (slb2->theObj());
+    if ( !ptr1 || !ptr2 )
+	return false;
+    else
+	return ptr1->order() < ptr2->order();
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -282,7 +299,7 @@
 
     ZyppPoolIterator i, b, e;
     list<ZyppSel> slbList;
-  
+    
     switch ( type )
     {
 	case S_Selection:
@@ -324,6 +341,7 @@
 			slbList.push_back (*i);
 		    }
 		}
+		slbList.sort( orderPattern );
 		break;
 	    }
 	default:


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



Remember to have fun...

    

root＠suse.de

tags

participants (1)