refelct perl-URPM 0.84 API change in removal of packages

1 files changed, 3 insertions, 2 deletions

diff --git a/rpmdrake b/rpmdrake
index 85496af4..00421431 100755
--- a/rpmdrake
+++ b/rpmdrake
@@ -88,6 +88,7 @@ sub myformatList {
 
 sub split_fullname { $_[0] =~ /^(.*)-([^-]+-[^-]+)$/ }
 sub my_fullname { my ($name, $version, $release) = $_[0]->fullname; "$name-$version-$release" }
+sub urpm_name { my ($name, $version, $release, $arch) = $_[0]->fullname; "$name-$version-$release.$arch" }
 
 sub parse_compssUsers_flat {
     my (%compssUsers, $category);
@@ -1115,7 +1116,7 @@ sub get_installed_pkgs {
 		      my $fullname = my_fullname($pkg);
 		      if (!$base{$fullname} || ${$base{$fullname}} != 1) {
 			  #- I need to extract summary and description since they'll be lost when $pkg->pack_header
-			  $installed_pkgs{$fullname} = { selected => 0, pkg => $pkg, summary => $pkg->summary,
+			  $installed_pkgs{$fullname} = { selected => 0, pkg => $pkg, urpm_name => urpm_name($pkg), summary => $pkg->summary,
 							 description => beautify_description($pkg->description) };
 			  $base{$fullname} and $installed_pkgs{$fullname}{base} = \${$base{$fullname}};
 		      }
@@ -1127,7 +1128,7 @@ sub get_installed_pkgs {
 
 sub perform_removal {
     my ($urpm, $pkgs) = @_;
-    my @toremove = grep { $pkgs->{$_}{selected} } keys %$pkgs;
+    my @toremove = map { if_($pkgs->{$_}{selected}, $pkgs->{$_}{urpm_name}) } keys %$pkgs;
     standalone::explanations("Removing package $_") foreach sort @toremove;
     my @results;
     slow_func(N("Please wait, removing packages..."),