- force switch to db4.2 and rpm built with it, release 16

[packages/poldek.git] / poldek-epoch0.patch

diff --git a/poldek-epoch0.patch b/poldek-epoch0.patch
index 5555822993e05aa6804ef5807c8fac8af78d1afc..3e4dbf0c3ba435ae8a7f1b1a481c91a31a1291b9 100644 (file)
--- 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)