aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--URPM/Resolve.pm2
-rw-r--r--perl-URPM.spec5
2 files changed, 5 insertions, 2 deletions
diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index d2677ca..ae4d5b4 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -672,7 +672,7 @@ sub request_packages_to_upgrade {
foreach my $pkg (values %names) {
foreach ($pkg->obsoletes) {
if (my ($n, $o, $v) = /^([^\s\[]*)(?:\[\*\])?\[?([^\s\]]*)\s*([^\s\]]*)/) {
- if ($names{$n} && (!$o || eval($names{$n}->compare($v) . $o . 0))) {
+ if ($n ne $pkg->name && $names{$n} && (!$o || eval($names{$n}->compare($v) . $o . 0))) {
#- an existing best package is obsoleted by another one.
$skip{$n} = undef;
}
diff --git a/perl-URPM.spec b/perl-URPM.spec
index d3d3bd4..7df1574 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 8mdk
+%define release 9mdk
%{expand:%%define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)}
@@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Feb 19 2003 François Pons <fpons@mandrakesoft.com> 0.81-9mdk
+- handle titi sucks on libalsa2 which obsoletes itself.
+
* Thu Feb 13 2003 François Pons <fpons@mandrakesoft.com> 0.81-8mdk
- fixed compute_installed_flags to take of compatible arch.