- rel .10

[packages/poldek.git] / poldek-rpm-4.4.9.patch

diff -ur poldek-0.20.1-cvs20070108.22.org/configure.in poldek-0.20.1-cvs20070108.22/configure.in
--- poldek-0.20.1-cvs20070108.22.org/configure.in	2007-01-08 22:14:18.000000000 +0100
+++ poldek-0.20.1-cvs20070108.22/configure.in	2007-06-05 20:32:56.716966945 +0200
@@ -305,6 +305,7 @@
 dnl rpm 4.4.7
 dnl  - killed rpmMachineScore and rpmGetVar
 AC_CHECK_FUNCS(rpmMachineScore)
+AC_CHECK_FUNCS(rpmPlatformScore)
 AC_CHECK_FUNCS(rpmGetVar)
 AC_CHECK_FUNCS(rpmioAccess)
 dnl  - new _rpmvercmp()
diff -ur poldek-0.20.1-cvs20070108.22.org/pm/rpm/misc.c poldek-0.20.1-cvs20070108.22/pm/rpm/misc.c
--- poldek-0.20.1-cvs20070108.22.org/pm/rpm/misc.c	2007-01-08 22:14:18.000000000 +0100
+++ poldek-0.20.1-cvs20070108.22/pm/rpm/misc.c	2007-06-05 20:33:44.656034816 +0200
@@ -47,7 +47,7 @@
         struct capreq *cr;
         uint32_t flags, crflags;
 
-        name = rpmdsN(ds);
+        name = rpmdsDNEVR(ds)+2;
         evr = rpmdsEVR(ds);
         flags = rpmdsFlags(ds);
         
@@ -163,8 +163,11 @@
     return caps;
 }
 
-
-#ifdef HAVE_RPMMACHINESCORE
+#ifdef HAVE_RPMPLATFORMSCORE
+static int machine_score(int tag, const char *val) {
+    return rpmPlatformScore(val, platpat, nplatpat);
+}
+#elif defined(HAVE_RPMMACHINESCORE)
 static int machine_score(int tag, const char *val)
 {
     int rpmtag = 0, rc;
@@ -231,8 +234,10 @@
     
     if (arch == NULL)
         return 0;
-    
-#ifdef HAVE_RPMMACHINESCORE    
+
+#ifdef HAVE_RPMPLATFORMSCORE
+    rc = rpmPlatformScore(arch, platpat, nplatpat);
+#elif defined(HAVE_RPMMACHINESCORE)
     rc = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch);
 #else
     rc = 9;
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
--- poldek-0.20.1-cvs20070108.22.org/pm/rpm/pm_rpm.h	2007-01-08 15:59:16.000000000 +0100
+++ poldek-0.20.1-cvs20070108.22/pm/rpm/pm_rpm.h	2007-06-05 20:32:56.696965944 +0200
@@ -2,6 +2,7 @@
 #define POLDEK_PM_RPM_MODULE_H
 
 #include <rpm/rpmlib.h>
+#include <rpm/rpmevr.h>
 #ifdef HAVE_RPM_4_0_4
 # include <rpm/rpmcli.h>
 #endif
diff -ur poldek-0.20.1-cvs20070108.22.org/pm/rpm/rpm.c poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c
--- poldek-0.20.1-cvs20070108.22.org/pm/rpm/rpm.c	2006-12-18 09:53:02.000000000 +0100
+++ poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c	2007-06-05 20:32:56.696965944 +0200
@@ -403,7 +403,7 @@
     
 
 #ifndef HAVE__RPMVERCMP /* _rpmvercmp - new in rpm 4.4.7 */       
-extern int rpmvercmp(const char *one, const char *two);
+extern int (*rpmvercmp)(const char *one, const char *two);
 #endif
 
 int pm_rpm_vercmp(const char *one, const char *two)