diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-03-06 18:51:57 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-03-06 18:51:57 +0000 |
| commit | 8e922c8f0fcb2ab94136cc934372725d576e437d (patch) | |
| tree | 17acbd1389b88480edb572918ebff5f20117080e | |
| parent | 1df3056c1208985de05b82b66ea929408674ca06 (diff) | |
| download | rpmtools-8e922c8f0fcb2ab94136cc934372725d576e437d.tar rpmtools-8e922c8f0fcb2ab94136cc934372725d576e437d.tar.gz rpmtools-8e922c8f0fcb2ab94136cc934372725d576e437d.tar.bz2 rpmtools-8e922c8f0fcb2ab94136cc934372725d576e437d.tar.xz rpmtools-8e922c8f0fcb2ab94136cc934372725d576e437d.zip | |
4.2-7mdk, final ?
| -rw-r--r-- | rpmtools.pm | 2 | ||||
| -rw-r--r-- | rpmtools.spec | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index d8954c1..4af053d 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -413,7 +413,7 @@ sub compute_depslist { if (@choices_id == 1) { $id = $choices_id[0]; } else { - my $choices_key = join '|', @choices_id; + my $choices_key = join '|', sort { $a <=> $b } @choices_id; exists $requires_id{$choices_key} or push @requires_id, \@choices_id; $requires_id{$choices_key} = undef; next; diff --git a/rpmtools.spec b/rpmtools.spec index 27efde1..e7f1dab 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 6mdk +%define release 7mdk # do not modify here, see Makefile in the CVS %define version 4.2 @@ -53,6 +53,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Wed Mar 6 2002 François Pons <fpons@mandrakesoft.com> 4.2-7mdk +- was sure choices in depslist.ordered was sorted, this was not + the case, but not for the final, it will be. + * Wed Feb 27 2002 François Pons <fpons@mandrakesoft.com> 4.2-6mdk - removed explicit requires on perl-base (done by spec helper). - rpmtools.xs code cleaning. |