diff options
| -rw-r--r-- | rpmtools.pm | 3 | ||||
| -rw-r--r-- | rpmtools.spec | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm index 8ef4dee..5d5ea6d 100644 --- a/rpmtools.pm +++ b/rpmtools.pm @@ -427,8 +427,7 @@ sub relocate_depslist { if ($p) { my $cmp_version = version_compare($_->{version}, $p->{version}); my $cmp_release = $cmp_version == 0 && version_compare($_->{release}, $p->{release}); - if ($cmp_version > 0 || - $cmp_release > 0 || + if ($_->{serial} > $p->{serial} || $cmp_version > 0 || $cmp_release > 0 || $cmp_version == 0 && $cmp_release == 0 && better_arch($_->{arch}, $p->{arch})) { $params->{info}{$_->{name}} = $_; ++$relocated_entries; diff --git a/rpmtools.spec b/rpmtools.spec index 54648bd..a4940a3 100644 --- a/rpmtools.spec +++ b/rpmtools.spec @@ -1,5 +1,5 @@ %define name rpmtools -%define release 3mdk +%define release 4mdk # do not modify here, see Makefile in the CVS %define version 3.0 @@ -54,6 +54,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/perl5/man/*/* %changelog +* Wed Jun 27 2001 François Pons <fpons@mandrakesoft.com> 3.0-4mdk +- take care of epoch (serial) for version comparison. + * Tue Jun 26 2001 François Pons <fpons@mandrakesoft.com> 3.0-3mdk - improved arch management and relocation code. - fix bad arch parsing when building hdlist. |