diff options
| -rw-r--r-- | rpmtools.pm | 6 | ||||
| -rw-r--r-- | rpmtools.spec | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index dd33299..0194192 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -223,7 +223,7 @@ sub compute_depslist { foreach (@{$info->{requires} || []}) { unless (exists $requires{$_}) { $requires{$_} = undef; - push @requires, $_; + push @{ref $_ ? \@required_packages : \@requires}, $_; } } } @@ -314,7 +314,9 @@ sub compute_depslist { if (@choices_base_id) { ($id, $base) = ($choices_base_id[0], 1); } else { - push @requires_id, \@choices_id; + my $choices_key = join '|', @choices_id; + exists $requires_id{$choices_key} or push @requires_id, \@choices_id; + $requires_id{$choices_key} = undef; next; } } else { diff --git a/rpmtools.spec b/rpmtools.spec index 07b08ac..80932cc 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 9mdk +%define release 10mdk # do not modify here, see Makefile in the CVS %define version 2.3 @@ -51,6 +51,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Thu Mar 8 2001 François Pons <fpons@mandrakesoft.com> 2.3-10mdk +- fixed duplicate choices in depslist.ordered file. +- fixed missing choices on some deps. + * Wed Mar 7 2001 François Pons <fpons@mandrakesoft.com> 2.3-9mdk - make sure parsehdlist exit correctly. |