diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-07-03 16:11:56 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-07-03 16:11:56 +0000 |
| commit | 20030d3ddf748fb56eb842a0288d090a4c4bb0c6 (patch) | |
| tree | 79b27a8df939d3e0adde779ee53b97e06583ec38 | |
| parent | 62827bdad31e9dbe895aaa5f44f6d02c50f9c6e4 (diff) | |
| download | perl-URPM-20030d3ddf748fb56eb842a0288d090a4c4bb0c6.tar perl-URPM-20030d3ddf748fb56eb842a0288d090a4c4bb0c6.tar.gz perl-URPM-20030d3ddf748fb56eb842a0288d090a4c4bb0c6.tar.bz2 perl-URPM-20030d3ddf748fb56eb842a0288d090a4c4bb0c6.tar.xz perl-URPM-20030d3ddf748fb56eb842a0288d090a4c4bb0c6.zip | |
0.06-2mdk
| -rw-r--r-- | URPM/Resolve.pm | 2 | ||||
| -rw-r--r-- | perl-URPM.spec | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm index afc7864..e5aaa18 100644 --- a/URPM/Resolve.pm +++ b/URPM/Resolve.pm @@ -364,7 +364,7 @@ sub resolve_packages_to_upgrade { unless (grep { ranges_overlap($property, $_) } $p->obsoletes) { if (my ($n) = $property =~ /^([^\s\[]*)/) { foreach my $pkg (@{$obsoletes{$n} || []}) { - next if $pkg->name eq $p->name; + next if $pkg->name eq $p->name || $p->name ne $n; foreach ($pkg->obsoletes) { if (ranges_overlap($property, $_)) { #- the package being examined can be obsoleted. diff --git a/perl-URPM.spec b/perl-URPM.spec index aab7e41..fa66d3d 100644 --- a/perl-URPM.spec +++ b/perl-URPM.spec @@ -1,7 +1,7 @@ %define name perl-URPM %define real_name URPM %define version 0.06 -%define release 1mdk +%define release 2mdk %{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)} @@ -48,6 +48,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jul 3 2002 François Pons <fpons@mandrakesoft.com> 0.06-2mdk +- fixed virtual provides obsoleted by other package (means kernel + is requested to be installed even if other kernel is installed). + * Wed Jul 3 2002 François Pons <fpons@mandrakesoft.com> 0.06-1mdk - added header_filename and update_header to URPM::Package. - added virtual flag selected to URPM::Package. |