1 --- satyr-0.15/lib/Makefile.am.orig 2014-01-07 17:07:58.000000000 +0100
2 +++ satyr-0.15/lib/Makefile.am 2014-02-02 20:51:35.551284308 +0100
7 -libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS)
8 +libsatyr_conv_la_CFLAGS = -Wall -Wformat=2 -std=gnu99 -D_GNU_SOURCE -I$(top_srcdir)/include $(GLIB_CFLAGS) $(RPM_CFLAGS)
9 libsatyr_conv_la_LDFLAGS = $(GLIB_LIBS)
12 --- satyr-0.3/configure.ac.orig 2013-04-05 19:30:55.747216259 +0200
13 +++ satyr-0.3/configure.ac 2013-04-05 19:35:07.100544357 +0200
15 AC_CHECK_LIB([unwind-coredump], [main])
18 +PKG_CHECK_MODULES([RPM], [rpm])
19 AC_CHECK_LIB([rpm], [main])
22 --- satyr-0.3/lib/rpm.c.orig 2013-03-25 15:07:04.000000000 +0100
23 +++ satyr-0.3/lib/rpm.c 2013-04-06 10:59:35.792721546 +0200
25 #include <rpm/rpmlib.h>
26 #include <rpm/rpmdb.h>
27 #include <rpm/rpmts.h>
28 -#include <rpm/rpmtd.h>
29 #include <rpm/header.h>
36 - rpmtd tag_data = rpmtdNew();
37 - int success = headerGet(header,
45 + int success = headerGetEntry(header, tag, &type, &p, &cnt);
50 - const char *str = rpmtdGetString(tag_data);
51 + const char *str = (type == RPM_STRING_TYPE) ? p :
52 + (((type == RPM_STRING_ARRAY_TYPE) || (type == RPM_I18NSTRING_TYPE)) ? *(strp = p) : NULL);
53 *result = (str ? sr_strdup(str) : NULL);
54 - rpmtdFree(tag_data);
55 + if(type == RPM_STRING_ARRAY_TYPE)
64 - rpmtd tag_data = rpmtdNew();
65 - int success = headerGet(header,
71 + int success = headerGetEntry(header, tag, &type, &p, &cnt);
76 - uint32_t *num = rpmtdGetUint32(tag_data);
77 + if (type != RPM_UINT32_TYPE)
83 - rpmtdFree(tag_data);