update for urpmi-4.3

2 files changed, 7 insertions, 6 deletions

diff --git a/rpmdrake b/rpmdrake
index 4949d25f..ef70bd3e 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -318,7 +318,8 @@ or you already installed all of them."));
 			   if ($mode eq 'by_source') {
 			       $add_node->($_->[0], pkg2medium($pkgs->{$_->[0]}{pkg}, $urpm)->{name}) foreach $sortmethods{flat}->(@elems);
 			   } elsif ($mode eq 'by_presence') {
-			       $add_node->($_->[0], $pkgs->{$_->[0]}{pkg}->flag_installed ? N("Upgradable") : N("Addable"))
+			       $add_node->($_->[0], $pkgs->{$_->[0]}{pkg}->flag_installed && !$pkgs->{$_->[0]}{pkg}->flag_skip
+                                                    ? N("Upgradable") : N("Addable"))
 				 foreach $sortmethods{flat}->(@elems);
 			   } else {
 			       #- special case, we don't populate all the tree at first (to speed things up)
@@ -415,10 +416,6 @@ or you already installed all of them."));
 					 sub { $urpm->resolve_requested(db(), $urpm->{state}, { map { $pkgs->{$_}{pkg}->id => 1 } @nodes },
 							   callback_choices => $callback_choices, no_flag_update => 1, keep_state => 1) });
 			       my $pkg_sel_after_selection = sub {
-				   $urpm->deselect_unwanted_packages($urpm->{state}{selected});
-				   if (%{$urpm->{state}{ask_unselect} || {}}) {
-				       delete @{$urpm->{state}{selected}}{keys %{delete $urpm->{state}{ask_unselect}}};
-				   }
 				   @nodes_with_deps = map { my_fullname($urpm->{depslist}[$_]) } keys %{$urpm->{state}{selected}};
 			       };
 			       $pkg_sel_after_selection->();
diff --git a/rpmdrake.spec b/rpmdrake.spec
index 71e6a8f3..428d2d6b 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -16,7 +16,7 @@ Release: %{release}
 License: GPL
 Source0: rpmdrake.tar.bz2
 Summary: Mandrake Linux graphical front end for choosing packages for installion/removal
-Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.2-25mdk perl-URPM >= 0.60 drakxtools >= 9.1-0.12mdk grpmi >= 9.0 rpmtools >= 4.5
+Requires: perl-MDK-Common >= 1.0.4-13mdk urpmi >= 4.3 perl-URPM >= 0.82-2mdk drakxtools >= 9.1-0.12mdk grpmi >= 9.0 rpmtools >= 4.5
 Requires: perl-GTK2 > 0.0.cvs.2003.02.12.1-2mdk
 BuildRequires: libcurl2-devel >= 7.10.3-2mdk rpm-devel gettext openssl-devel perl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
@@ -117,6 +117,10 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Tue Apr 15 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-16mdk
+- update for urpmi-4.3 (skipped packages should be better handled
+  now: they will appear in package selection and searches, but
+  not in "Upgradable" under "sort by update availability", as one
+  would expect)
 - MandrakeUpdate: UI change to follow David Walser's suggestions and
   patches from #3610, e.g. don't use two paned windows anymore