poldek-rpm-4.4.9.patch

   1 diff -ur poldek-0.20.1-cvs20070108.22.org/configure.in poldek-0.20.1-cvs20070108.22/configure.in
   2 --- poldek-0.20.1-cvs20070108.22.org/configure.in       2007-01-08 22:14:18.000000000 +0100
   3 +++ poldek-0.20.1-cvs20070108.22/configure.in   2007-06-05 20:32:56.716966945 +0200
   4 @@ -305,6 +305,7 @@
   5  dnl rpm 4.4.7
   6  dnl  - killed rpmMachineScore and rpmGetVar
   7  AC_CHECK_FUNCS(rpmMachineScore)
   8 +AC_CHECK_FUNCS(rpmPlatformScore)
   9  AC_CHECK_FUNCS(rpmGetVar)
  10  AC_CHECK_FUNCS(rpmioAccess)
  11  dnl  - new _rpmvercmp()
  12 diff -ur poldek-0.20.1-cvs20070108.22.org/pm/rpm/misc.c poldek-0.20.1-cvs20070108.22/pm/rpm/misc.c
  13 --- poldek-0.20.1-cvs20070108.22.org/pm/rpm/misc.c      2007-01-08 22:14:18.000000000 +0100
  14 +++ poldek-0.20.1-cvs20070108.22/pm/rpm/misc.c  2007-06-05 20:33:44.656034816 +0200
  15 @@ -47,7 +47,7 @@
  16          struct capreq *cr;
  17          uint32_t flags, crflags;
  18
  19 -        name = rpmdsN(ds);
  20 +        name = rpmdsDNEVR(ds)+2;
  21          evr = rpmdsEVR(ds);
  22          flags = rpmdsFlags(ds);
  23
  24 @@ -163,8 +163,11 @@
  25      return caps;
  26  }
  27
  28 -
  29 -#ifdef HAVE_RPMMACHINESCORE
  30 +#ifdef HAVE_RPMPLATFORMSCORE
  31 +static int machine_score(int tag, const char *val) {
  32 +    return rpmPlatformScore(val, platpat, nplatpat);
  33 +}
  34 +#elif defined(HAVE_RPMMACHINESCORE)
  35  static int machine_score(int tag, const char *val)
  36  {
  37      int rpmtag = 0, rc;
  38 @@ -231,8 +234,10 @@
  39
  40      if (arch == NULL)
  41          return 0;
  42 -
  43 -#ifdef HAVE_RPMMACHINESCORE
  44 +
  45 +#ifdef HAVE_RPMPLATFORMSCORE
  46 +    rc = rpmPlatformScore(val, platpat, nplatpat);
  47 +#elif defined(HAVE_RPMMACHINESCORE)
  48      rc = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch);
  49  #else
  50      rc = 9;
  51 diff -ur poldek-0.20.1-cvs20070108.22.org/pm/rpm/pm_rpm.h poldek-0.20.1-cvs20070108.22/pm/rpm/pm_rpm.h
  52 --- poldek-0.20.1-cvs20070108.22.org/pm/rpm/pm_rpm.h    2007-01-08 15:59:16.000000000 +0100
  53 +++ poldek-0.20.1-cvs20070108.22/pm/rpm/pm_rpm.h        2007-06-05 20:32:56.696965944 +0200
  54 @@ -2,6 +2,7 @@
  55  #define POLDEK_PM_RPM_MODULE_H
  56
  57  #include <rpm/rpmlib.h>
  58 +#include <rpm/rpmevr.h>
  59  #ifdef HAVE_RPM_4_0_4
  60  # include <rpm/rpmcli.h>
  61  #endif
  62 diff -ur poldek-0.20.1-cvs20070108.22.org/pm/rpm/rpm.c poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c
  63 --- poldek-0.20.1-cvs20070108.22.org/pm/rpm/rpm.c       2006-12-18 09:53:02.000000000 +0100
  64 +++ poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c   2007-06-05 20:32:56.696965944 +0200
  65 @@ -403,7 +403,7 @@
  66
  67
  68  #ifndef HAVE__RPMVERCMP /* _rpmvercmp - new in rpm 4.4.7 */
  69 -extern int rpmvercmp(const char *one, const char *two);
  70 +extern int (*rpmvercmp)(const char *one, const char *two);
  71  #endif
  72
  73  int pm_rpm_vercmp(const char *one, const char *two)