]>
Commit | Line | Data |
---|---|---|
1ff4c185 PZ |
1 | --- poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c~ 2006-12-18 09:53:02.000000000 +0100 |
2 | +++ poldek-0.20.1-cvs20070108.22/pm/rpm/rpm.c 2007-05-23 17:16:25.562776091 +0200 | |
3 | @@ -403,7 +403,7 @@ | |
4 | ||
5 | ||
6 | #ifndef HAVE__RPMVERCMP /* _rpmvercmp - new in rpm 4.4.7 */ | |
7 | -extern int rpmvercmp(const char *one, const char *two); | |
8 | +extern int (*rpmvercmp)(const char *one, const char *two); | |
9 | #endif | |
10 | ||
11 | int pm_rpm_vercmp(const char *one, const char *two) | |
12 | --- poldek-0.20.1-cvs20070108.22/pm/rpm/pm_rpm.h~ 2007-01-08 15:59:16.000000000 +0100 | |
13 | +++ poldek-0.20.1-cvs20070108.22/pm/rpm/pm_rpm.h 2007-05-23 16:58:49.155380566 +0200 | |
14 | @@ -2,6 +2,7 @@ | |
15 | #define POLDEK_PM_RPM_MODULE_H | |
16 | ||
17 | #include <rpm/rpmlib.h> | |
18 | +#include <rpm/rpmevr.h> | |
19 | #ifdef HAVE_RPM_4_0_4 | |
20 | # include <rpm/rpmcli.h> | |
21 | #endif | |
e5783f75 AM |
22 | --- poldek-0.20.1-cvs20070108.22/configure.in 2007-05-27 20:05:24.702600301 +0200 |
23 | +++ poldek-0.20.1-cvs20070108.22-new/configure.in 2007-05-27 20:05:03.038233602 +0200 | |
24 | @@ -302,6 +302,7 @@ | |
25 | dnl rpm 4.4.7 | |
26 | dnl - killed rpmMachineScore and rpmGetVar | |
27 | AC_CHECK_FUNCS(rpmMachineScore) | |
28 | +AC_CHECK_FUNCS(rpmPlatformScore) | |
29 | AC_CHECK_FUNCS(rpmGetVar) | |
30 | AC_CHECK_FUNCS(rpmioAccess) | |
31 | dnl - new _rpmvercmp() | |
32 | --- poldek-0.20.1-cvs20070108.22/pm/rpm/misc.c 2007-05-27 20:05:24.705933794 +0200 | |
33 | +++ poldek-0.20.1-cvs20070108.22-new/pm/rpm/misc.c 2007-05-27 20:04:43.153951811 +0200 | |
34 | @@ -182,8 +182,11 @@ | |
35 | return caps; | |
57535125 | 36 | } |
e5783f75 AM |
37 | |
38 | - | |
39 | -#ifdef HAVE_RPMMACHINESCORE | |
40 | +#ifdef HAVE_RPMPLATOFMSCORE | |
41 | +static int machine_score(int tag, const char *val) { | |
42 | + return rpmPlatformScore(val, platpat, nplatpat); | |
43 | +} | |
44 | +#elif defined(HAVE_RPMMACHINESCORE) | |
45 | static int machine_score(int tag, const char *val) | |
46 | { | |
47 | int rpmtag = 0, rc; | |
48 | @@ -249,8 +252,10 @@ | |
49 | ||
50 | if (arch == NULL) | |
51 | return 0; | |
52 | - | |
53 | -#ifdef HAVE_RPMMACHINESCORE | |
54 | + | |
55 | +#ifdef HAVE_RPMPLATOFMSCORE | |
56 | + rc = rpmPlatformScore(val, platpat, nplatpat); | |
57 | +#elif defined(HAVE_RPMMACHINESCORE) | |
58 | rc = rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); | |
59 | #else | |
60 | rc = 9; |