aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-03-06 18:59:35 +0000
committerFrancois Pons <fpons@mandriva.com>2002-03-06 18:59:35 +0000
commitbb5b9a6975978d2c680cd9e002a66b608e8bdd68 (patch)
tree1c742a38e596ef9ab5be38cd2609311e224cebff
parent8e922c8f0fcb2ab94136cc934372725d576e437d (diff)
downloadrpmtools-bb5b9a6975978d2c680cd9e002a66b608e8bdd68.tar
rpmtools-bb5b9a6975978d2c680cd9e002a66b608e8bdd68.tar.gz
rpmtools-bb5b9a6975978d2c680cd9e002a66b608e8bdd68.tar.bz2
rpmtools-bb5b9a6975978d2c680cd9e002a66b608e8bdd68.tar.xz
rpmtools-bb5b9a6975978d2c680cd9e002a66b608e8bdd68.zip
4.2-8mdk, now final 8.2 ?
-rw-r--r--rpmtools.pm2
-rw-r--r--rpmtools.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/rpmtools.pm b/rpmtools.pm
index 4af053d..c65d300 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -428,7 +428,7 @@ sub compute_depslist {
$id == $pkg->{id} || $base or push @requires_id, $id;
}
#- cannot remove requires values as they are necessary for closure on incremental job.
- $pkg->{deps} = join(' ', map { join '|', @{ref $_ ? $_ : [$_]} } @requires_id);
+ $pkg->{deps} = join(' ', map { join '|', sort { $a <=> $b } @{ref $_ ? $_ : [$_]} } @requires_id);
push @{$params->{depslist}}, $pkg;
}
1;
diff --git a/rpmtools.spec b/rpmtools.spec
index e7f1dab..b7a3d69 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 7mdk
+%define release 8mdk
# do not modify here, see Makefile in the CVS
%define version 4.2
@@ -53,6 +53,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/perl5/man/*/*
%changelog
+* Wed Mar 6 2002 François Pons <fpons@mandrakesoft.com> 4.2-8mdk
+- partial fix, now choices are really sorted in depslist.ordered.
+
* 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.