From 8a90fb13057dde4edaea7c368ed30bf58e282cd4 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 6 Jan 2003 16:33:17 +0000 Subject: 0.81-6mdk --- URPM/Resolve.pm | 5 +++-- perl-URPM.spec | 6 +++++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index 0e6041b..0717e5d 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -312,8 +312,9 @@ sub resolve_requested { #- all package with the same name should now be avoided except what is chosen. $p->fullname eq $pkg->fullname or $avoided{$p->fullname} = $pkg->fullname; } else { - #- in case of obsoletes, keep track of what should be avoided. - !$o || eval($p->compare($v) . $o . 0) or next; + #- in case of obsoletes, keep track of what should be avoided + #- but only if package name equals the obsolete name. + $p->name eq $n && (!$o || eval($p->compare($v) . $o . 0)) or next; $avoided{$p->fullname} = $pkg->fullname; } } diff --git a/perl-URPM.spec b/perl-URPM.spec index fea71e1..144b51f 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.81 -%define release 5mdk +%define release 6mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -49,6 +49,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 6 2003 François Pons 0.81-6mdk +- fixed avoiding package with virtual provides obsoleted by + another package as this is not a true obsoletes (openssh). + * Mon Jan 6 2003 François Pons 0.81-5mdk - fixed bad filename generation (cause problem to genhdlist if renamed packages are existing). -- cgit v1.2.1