aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-06-27 15:18:09 +0000
committerFrancois Pons <fpons@mandriva.com>2001-06-27 15:18:09 +0000
commit90f0ddcedeae721156de02165ba43368ca19545f (patch)
tree83b12f4de3975a705f5cc9be21a60e00329ea846
parent038e468d6fa67c59b70ef5ef879ddaab231ffe96 (diff)
downloadrpmtools-90f0ddcedeae721156de02165ba43368ca19545f.tar
rpmtools-90f0ddcedeae721156de02165ba43368ca19545f.tar.gz
rpmtools-90f0ddcedeae721156de02165ba43368ca19545f.tar.bz2
rpmtools-90f0ddcedeae721156de02165ba43368ca19545f.tar.xz
rpmtools-90f0ddcedeae721156de02165ba43368ca19545f.zip
*** empty log message ***
-rw-r--r--rpmtools.pm5
-rw-r--r--rpmtools.spec5
2 files changed, 7 insertions, 3 deletions
diff --git a/rpmtools.pm b/rpmtools.pm
index 5d5ea6d..5dceb4a 100644
--- a/rpmtools.pm
+++ b/rpmtools.pm
@@ -425,10 +425,11 @@ sub relocate_depslist {
}
if (compat_arch($_->{arch})) {
if ($p) {
- my $cmp_version = version_compare($_->{version}, $p->{version});
+ my $cmp_version = $_->{serial} == $p->{serial} && version_compare($_->{version}, $p->{version});
my $cmp_release = $cmp_version == 0 && version_compare($_->{release}, $p->{release});
if ($_->{serial} > $p->{serial} || $cmp_version > 0 || $cmp_release > 0 ||
- $cmp_version == 0 && $cmp_release == 0 && better_arch($_->{arch}, $p->{arch})) {
+ ($_->{serial} == $p->{serial} && $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 a4940a3..639cf46 100644
--- a/rpmtools.spec
+++ b/rpmtools.spec
@@ -1,5 +1,5 @@
%define name rpmtools
-%define release 4mdk
+%define release 5mdk
# 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-5mdk
+- fix problem interpreting serial.
+
* Wed Jun 27 2001 François Pons <fpons@mandrakesoft.com> 3.0-4mdk
- take care of epoch (serial) for version comparison.