1 files changed, 23 insertions, 10 deletions
diff --git a/rpm-find-leaves b/rpm-find-leaves
index f94190c5..781422b7 100644
--- a/rpm-find-leaves
+++ b/rpm-find-leaves
@@ -1,19 +1,32 @@
 #!/usr/bin/perl
 
+use lib "../rpmtools";
+
 local $_ = join '', @ARGV;
 
 /-h/ and die "usage: rpm-find-leaves [--show-unknown]\n";
 
 $show_unknown = /-show-unknown/;
 
-$r = join '|', map { chop; $l{$_} = 1; quotemeta } `rpm -qa --queryformat "%{NAME}\n"`;
-$R = qr/ ($r)-\d/;
-$R2 = qr/$r /;
-open F, "/var/lib/urpmi/depslist" or die "can't find depslist\n";
-F: foreach (<F>) {
-    my ($p) = /(\S+)-[^-]+-[^-]+ /;
-    $p =~ $R2 or next; # not installed
-    $L{$p} = 1;
-    delete $l{$1} while /$R/g;
+use rpmtools;
+
+$f = "/var/lib/urpmi/depslist.ordered";
+open F, $f or die "read_depslist: can't open file $f\n";
+$o = new rpmtools;
+$o->read_depslist(\*F);
+
+chop, $l{$_} = 1 foreach `rpm -qa --queryformat "%{name}\n"`;
+
+%m = %l;
+
+foreach (@{$o->{depslist}}) {    
+    delete $m{$_->{name}} or next;
+    delete $l{$o->{depslist}[$_]{name}} foreach split ' ', $_->{deps};
+}
+
+!$m{$_} and print "$_\n" foreach sort keys %l;
+
+if ($show_unknown) {
+    print "\n";
+    print "$_\n" foreach sort keys %m;
 }
-$show_unknown || $L{$_} and print "$_\n" foreach keys %l;