From a19fd084df159a9b5f9fa7584d56495f5e74f584 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Thu, 27 Nov 2003 16:15:16 +0000
Subject: [PATCH] - too fast... fixed finding package by name alone (for
 packages with Epoch>0)

Changed files:
    poldek-epoch0.patch -> 1.2
---
 poldek-epoch0.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/poldek-epoch0.patch b/poldek-epoch0.patch
index 5555822..3e4dbf0 100644
--- a/poldek-epoch0.patch
+++ b/poldek-epoch0.patch
@@ -17,7 +17,7 @@ diff -Nur poldek-0.18.1.orig/pkg.c poldek-0.18.1/pkg.c
          return 1;
      
 -    if (capreq_has_epoch(req) && pkg->epoch) {    
-+    if (capreq_has_epoch(req)) {
++    if (capreq_has_epoch(req) && (pkg->epoch || pkg->ver)) {
          cmprc = pkg->epoch - capreq_epoch(req);
          if (cmprc != 0)
              return rel_match(cmprc, req);
@@ -41,7 +41,7 @@ diff -Nur poldek-0.18.1.orig/pkgset.c poldek-0.18.1/pkgset.c
      int rc = 1;
      
 -    if (pdef->pkg->epoch && pkg->epoch != pdef->pkg->epoch)
-+    if (pkg->epoch != pdef->pkg->epoch)
++    if ((pdef->pkg->epoch /* || pdef->pkg->ver */) && pkg->epoch != pdef->pkg->epoch)
          rc = 0;
      
      if (rc && *pdef->pkg->ver) 
-- 
2.44.0