perl-URPM API change: gives architecture in ask_remove

2 files changed, 12 insertions, 4 deletions

diff --git a/rpmdrake b/rpmdrake
index cd249126..85496af4 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -237,6 +237,12 @@ sub find_installed_version {
     @version ? join(',', sort @version) : N("(none)");
 }
 
+#- remove architecture
+sub ask_remove_ {
+    my ($state) = @_;
+    map { /(.*)\.[^\.]+$/ && $1 } keys %{$state->{ask_remove}};
+}
+
 sub run_treeview_dialog {
     my ($pkgs_provider, $callback_action) = @_;
 
@@ -284,7 +290,7 @@ sub run_treeview_dialog {
 				  $urpm->resolve_closure_ask_remove($db, $urpm->{state}, $_[0]);
 			      }) or die N("unknown package ") . "$_\n";
 	}
-	keys %{$urpm->{state}{ask_remove}};
+	ask_remove_($urpm->{state});
     };
     $options = {
 		   node_state => sub { $_[0] ? ($pkgs->{$_[0]}{selected} ? 'selected' : 'unselected')
@@ -385,12 +391,12 @@ or you already installed all of them."));
 		       if ($MODE eq 'remove') {
 			   if ($new_state) {
 			       slow_func($tree->window, sub { $closure_removal->(@nodes) });
-			       @nodes_with_deps = grep { !$pkgs->{$_}{selected} && !/^basesystem/ } keys %{$urpm->{state}{ask_remove}};
+			       @nodes_with_deps = grep { !$pkgs->{$_}{selected} && !/^basesystem/ } ask_remove_($urpm->{state});
 			       $deps_msg->(N("Some additional packages need to be removed"),
 					   N("Because of their dependencies, the following package(s) also need to be\nremoved:\n\n"),
 					   \@nodes, \@nodes_with_deps) or @nodes_with_deps = ();
 			       my @impossible_to_remove;
-			       foreach (grep { exists $pkgs->{$_}{base} } keys %{$urpm->{state}{ask_remove}}) {
+			       foreach (grep { exists $pkgs->{$_}{base} } ask_remove_($urpm->{state})) {
 				   ${$pkgs->{$_}{base}} == 1 ? push @impossible_to_remove, $_ : ${$pkgs->{$_}{base}}--;
 			       }
 			       @impossible_to_remove and interactive_msg_(N("Some packages can't be removed"),
diff --git a/rpmdrake.spec b/rpmdrake.spec
index cb334d3f..b642a1ca 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -16,13 +16,14 @@ 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 gurpmi >= 4.3-9mdk perl-URPM >= 0.82-2mdk drakxtools >= 9.1-0.12mdk rpmtools >= 4.5
+Requires: perl-MDK-Common >= 1.0.4-13mdk gurpmi >= 4.3-9mdk perl-URPM >= 0.84 drakxtools >= 9.1-0.12mdk rpmtools >= 4.5
 Requires: perl-GTK2 > 0.0.cvs.2003.02.12.1-2mdk perl-Locale-gettext >= 1.01-7mdk
 BuildRequires: libcurl2-devel >= 7.10.3-2mdk gettext openssl-devel perl-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Group: System/Configuration/Packaging
 URL: http://cvs.mandrakesoft.com/cgi-bin/cvsweb.cgi/soft/rpmdrake/
 Obsoletes: MandrakeUpdate
+Conflicts: perl-URPM < 0.84
 
 %description
 rpmdrake is a simple graphical frontend to manage software packages on a
@@ -101,6 +102,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %changelog
 * Fri May 16 2003 Guillaume Cottenceau <gc@mandrakesoft.com> 2.1-20mdk
+- perl-URPM API change: gives architecture in ask_remove
 - fix #3908 (garbage chars displayed as date in changelog entries in
   removal mode)