rpm-5.4.4-fix-same-package-with-epoch-possible-to-upgrade.patch

   1 --- rpm-5.4.4/lib/transaction.c.epoch_cmp~      2011-11-30 22:25:26.646155379 +0100
   2 +++ rpm-5.4.4/lib/transaction.c 2011-11-30 23:15:28.252768345 +0100
   3 @@ -1187,12 +1187,15 @@ rpmlog(RPMLOG_DEBUG, D_("sanity checking
   4                             const char *val = NULL;
   5                             he->tag = tags[t];
   6                             xx = headerGet(h, he, 0);
   7 -                           if (he->tag == RPMTAG_EPOCH)
   8 +                           if (he->tag == RPMTAG_EPOCH) {
   9                                 val = rpmteE(p);
  10 -                           else if (he->tag == RPMTAG_DISTEPOCH)
  11 +                               if (val ? atoi(val) : 0 != he->p.ui32p ? *(he->p.ui32p) : 0)
  12 +                                 nkeys--;
  13 +                           } else if (he->tag == RPMTAG_DISTEPOCH) {
  14                                 val = rpmteD(p);
  15 -                           if (strcmp(he->p.str ? he->p.str : "", val ? val : ""))
  16 -                               nkeys--;
  17 +                               if (strcmp(he->p.str ? he->p.str : "", val ? val : ""))
  18 +                                 nkeys--;
  19 +                           }
  20                             he->p.ptr = _free(he->p.ptr);
  21                         }
  22                         mi = rpmmiFree(mi);