From f6d62bb960449bb118b006b4f688be1840f4060f Mon Sep 17 00:00:00 2001
From: Rafael Garcia-Suarez <rgarciasuarez@mandriva.org>
Date: Wed, 7 Dec 2005 16:48:31 +0000
Subject: Fix longstanding epoch promotion bug, caused by braindead API design

---
 URPM/Resolve.pm | 2 ++
 perl-URPM.spec  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/URPM/Resolve.pm b/URPM/Resolve.pm
index 0c18dbb..b5ce035 100644
--- a/URPM/Resolve.pm
+++ b/URPM/Resolve.pm
@@ -23,6 +23,7 @@ sub min { my $n = shift; $_ < $n and $n = $_ foreach @_; $n }
 sub find_candidate_packages {
     my ($urpm, $dep, %options) = @_;
     my %packages;
+    $options{nopromoteepoch} = 1 unless defined $options{nopromoteepoch};
 
     foreach (split /\|/, $dep) {
 	if (/^\d+$/) {
@@ -184,6 +185,7 @@ sub sort_package_result { $b->compare_pkg($a) || $a->id <=> $b->id }
 sub unsatisfied_requires {
     my ($urpm, $db, $state, $pkg, %options) = @_;
     my %properties;
+    $options{nopromoteepoch} = 1 unless defined $options{nopromoteepoch};
 
     #- all requires should be satisfied according to selected packages or installed packages,
     #- or the package itself.
diff --git a/perl-URPM.spec b/perl-URPM.spec
index c0b4cf5..ca9fb29 100644
--- a/perl-URPM.spec
+++ b/perl-URPM.spec
@@ -6,7 +6,7 @@
 %define name perl-URPM
 %define real_name URPM
 %define version 1.29
-%define release %mkrel 1
+%define release %mkrel 1.1
 
 %define group %(perl -e 'printf "%%s\\n", "%_vendor" =~ /\\bmandr/i ? "Development/Perl" : "Applications/CPAN"')
 %define rpm_version %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' rpm)
-- 
cgit v1.2.1