Author: arekm Date: Sun May 20 23:35:46 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
ABI changed; soname didn't change
---- Files affected:
SOURCES:
poldek-rpm-4.4.8.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: SOURCES/poldek-rpm-4.4.8.patch
diff -u /dev/null SOURCES/poldek-rpm-4.4.8.patch:1.1
--- /dev/null Mon May 21 01:35:46 2007
+++ SOURCES/poldek-rpm-4.4.8.patch Mon May 21 01:35:41 2007
@@ -0,0 +1,45 @@
+diff -urN 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-05-21 01:33:15.000000000
+0200
+@@ -22,6 +22,8 @@
+ #include <stdint.h>
+ #include <string.h>
+
++#define _RPMPRCO_INTERNAL 1
++#define _RPMDS_INTERNAL 1
+ #include <rpm/rpmlib.h>
+ #if HAVE_RPMDSRPMLIB
+ # include <rpm/rpmds.h>
+@@ -73,6 +75,23 @@
+
+ typedef int (*rpmcap_fn)(rpmds *ds, void *);
+
++#ifdef HAVE_RPMDSSYSINFO
++static int pm_rpmdsSysinfo(rpmds * dsp, const char * fn) {
++ int ret;
++// XXX: better test welcome
++#define RPM_VERSION(a,b,c) ((a)*65536+(b)*256+(c))
++#if RPM_VERSION(RPM_FORMAT_VERSION,RPM_MAJOR_VERSION,RPM_MINOR_VERSION) >=
RPM_VERSION(4,4,8)
++ static rpmPRCO PRCO = rpmdsNewPRCO(NULL);
++ PRCO->Pdsp = dsp;
++ ret = rpmdsSysinfo(PRCO, fn);
++ rpmdsFreePRCO(PRCO);
++#else
++ ret = rpmdsSysinfo(dsp, fn);
++#endif
++ return ret;
++}
++#endif
++
+ static int get_rpmlib_caps(tn_array *caps)
+ {
+ rpmds ds = NULL;
+@@ -86,7 +105,7 @@
+ (rpmcap_fn)rpmdsGetconf,
+ #endif
+ #ifdef HAVE_RPMDSSYSINFO
+- (rpmcap_fn)rpmdsSysinfo,
++ (rpmcap_fn)pm_rpmdsSysinfo,
+ #endif
+ #ifdef HAVE_RPMDSUNAME
+ (rpmcap_fn)rpmdsUname,
================================================================
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
