]>
Commit | Line | Data |
---|---|---|
a7d09531 | 1 | --- poldek-0.20.1-cvs20060823.21/pm/rpm/misc.c~ 2006-07-10 13:17:36.000000000 +0200 |
2 | +++ poldek-0.20.1-cvs20060823.21/pm/rpm/misc.c 2006-10-30 16:19:12.548718000 +0100 | |
3 | @@ -171,24 +171,25 @@ | |
4 | ||
5 | int pm_rpm_machine_score(void *pm_rpm, int tag, const char *val) | |
6 | { | |
7 | - int rpmtag = 0; | |
8 | - | |
9 | pm_rpm = pm_rpm; | |
10 | switch (tag) { | |
11 | case PMMSTAG_ARCH: | |
12 | - rpmtag = RPM_MACHTABLE_INSTARCH; | |
13 | + return 1; | |
14 | + // no longer supported, decided it was | |
15 | + // not reliable enough | |
16 | break; | |
17 | ||
18 | case PMMSTAG_OS: | |
19 | - rpmtag = RPM_MACHTABLE_INSTOS; | |
20 | + return 1; | |
21 | + // no longer supported, always returned 1 | |
22 | + // as linux is the only ARCH supported | |
23 | break; | |
24 | ||
25 | default: | |
26 | n_assert(0); | |
27 | break; | |
28 | } | |
29 | - | |
30 | - return rpmMachineScore(rpmtag, val); | |
31 | + return 0; | |
32 | } | |
33 | ||
34 | ||
35 | @@ -197,6 +196,6 @@ | |
36 | if (arch == NULL) | |
37 | return 0; | |
38 | ||
39 | - return rpmMachineScore(RPM_MACHTABLE_INSTARCH, arch); | |
40 | + return 1; | |
41 | } | |
42 | ||
43 | --- poldek-0.20.1-cvs20060823.21/configure.in~ 2006-08-21 13:20:12.000000000 +0200 | |
44 | +++ poldek-0.20.1-cvs20060823.21/configure.in 2006-10-30 16:17:00.008718000 +0100 | |
45 | @@ -273,7 +273,7 @@ | |
46 | [$DBLIB -lrpmdb]), | |
47 | [$DBLIB]) | |
48 | ||
49 | -AC_CHECK_FUNCS(rpmMachineScore,,[ AC_MSG_ERROR(["rpmlib not found"])]) | |
50 | +#AC_CHECK_FUNCS(rpmMachineScore,,[ AC_MSG_ERROR(["rpmlib not found"])]) | |
51 | AC_CHECK_FUNCS(rpmlog rpmCheckSig rpmVerifySignature) | |
52 | ||
53 | dnl rpm 4.2? | |
54 | --- poldek-0.20.1-cvs20060823.21/pm/rpm/rpm.c~ 2006-08-22 16:53:28.000000000 +0200 | |
55 | +++ poldek-0.20.1-cvs20060823.21/pm/rpm/rpm.c 2006-11-02 21:10:17.138247000 +0100 | |
56 | @@ -402,7 +402,7 @@ | |
57 | #endif /* HAVE_RPMLOG */ | |
58 | ||
59 | ||
60 | -extern int rpmvercmp(const char *one, const char *two); | |
61 | +extern int (*rpmvercmp)(const char *one, const char *two); | |
62 | int pm_rpm_vercmp(const char *one, const char *two) | |
63 | { | |
64 | return rpmvercmp(one, two); | |
65 | --- poldek-0.20.1-cvs20060823.21/pm/rpm/rpmvercmp.c~ 2004-08-09 01:03:54.000000000 +0200 | |
66 | +++ poldek-0.20.1-cvs20060823.21/pm/rpm/rpmvercmp.c 2006-11-02 21:15:35.218247000 +0100 | |
67 | @@ -5,7 +5,7 @@ | |
68 | ||
69 | #include "i18n.h" | |
70 | ||
71 | -extern int rpmvercmp(const char * one, const char * two); | |
72 | +extern int (*rpmvercmp)(const char * one, const char * two); | |
73 | ||
74 | ||
75 | int main(int argc, char *argv[]) | |
76 | --- poldek-0.20.1-cvs20060823.21/pm/rpm/misc.c~ 2006-11-02 21:17:09.000000000 +0100 | |
77 | +++ poldek-0.20.1-cvs20060823.21/pm/rpm/misc.c 2006-11-02 21:39:35.168247000 +0100 | |
78 | @@ -166,7 +166,7 @@ | |
79 | const char *pm_rpm_get_arch(void *pm_rpm) | |
80 | { | |
81 | pm_rpm = pm_rpm; | |
82 | - return rpmGetVar(RPM_MACHTABLE_INSTARCH); | |
83 | + return rpmExpand("%{_target_cpu}", NULL); | |
84 | } | |
85 | ||
86 | int pm_rpm_machine_score(void *pm_rpm, int tag, const char *val) |