1 --- createrepo_c/src/misc.c.orig 2013-12-01 15:00:42.000000000 +0100
2 +++ createrepo_c/src/misc.c 2013-12-01 16:18:48.713931227 +0100
7 -#include <rpm/rpmlib.h>
8 +#include <rpm/rpmevr.h>
12 --- createrepo_c/CMakeLists.txt.orig 2013-12-01 15:00:42.000000000 +0100
13 +++ createrepo_c/CMakeLists.txt 2013-12-01 16:21:27.510591230 +0100
16 include_directories(${GLIB2_INCLUDE_DIRS})
17 include_directories(${LIBXML2_INCLUDE_DIR})
19 +include_directories("/usr/include/rpm")
23 --- createrepo_c/src/parsehdr.h.orig 2013-12-01 15:00:42.000000000 +0100
24 +++ createrepo_c/src/parsehdr.h 2013-12-01 16:55:23.000505810 +0100
29 -#include <rpm/rpmlib.h>
30 +#include <rpm/rpmtag.h>
34 --- createrepo_c/src/parsehdr.c.orig 2013-12-01 15:00:42.000000000 +0100
35 +++ createrepo_c/src/parsehdr.c 2013-12-01 16:33:26.753894379 +0100
40 +#include <rpm/rpm46compat.h>
41 #include <rpm/rpmfi.h>
48 +static inline void* rpmtdNew(void)
50 + return malloc(sizeof(struct rpmtd_s));
53 +static inline void rpmtdFree(rpmtd td)
58 +static inline void rpmtdInit(rpmtd td)
63 +static inline const char * headerGetString(Header h, int32_t tag)
65 + const char *res = NULL;
68 + if (headerGet(h, tag, &td, HEADERGET_MINMEM)) {
69 + if (rpmtdCount(&td) == 1) {
70 + res = rpmtdGetString(&td);
77 +static inline uint64_t rpmtdGetNumber(rpmtd td)
82 + ix = (td->ix >= 0 ? td->ix : 0);
85 + case RPM_INT64_TYPE:
86 + val = *((uint64_t *) td->data + ix);
88 + case RPM_INT32_TYPE:
89 + val = *((uint32_t *) td->data + ix);
91 + case RPM_INT16_TYPE:
92 + val = *((uint16_t *) td->data + ix);
96 + val = *((uint8_t *) td->data + ix);
104 +static inline uint64_t headerGetNumber(Header h, int32_t tag)
109 + if (headerGet(h, tag, &td, HEADERGET_EXT)) {
110 + if (rpmtdCount(&td) == 1) {
111 + res = rpmtdGetNumber(&td);
113 + rpmtdFreeData(&td);
119 cr_compare_dependency(const char *dep1, const char *dep2)
121 --- createrepo_c/src/parsepkg.c~ 2014-05-06 15:58:35.000000000 +0300
122 +++ createrepo_c/src/parsepkg.c 2014-06-15 14:59:03.744966692 +0300
125 #include <rpm/rpmts.h>
126 #include <rpm/rpmfi.h>
127 -#include <rpm/rpmlib.h>
128 #include <rpm/rpmmacro.h>
129 -#include <rpm/rpmkeyring.h>
130 +#include <rpm/rpmrc.h>
131 +#include <rpm/pkgio.h>
133 #include "parsehdr.h"
135 #include "checksum.h"
137 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
138 +#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
143 --- createrepo_c/src/CMakeLists.txt.orig 2013-12-01 15:00:42.000000000 +0100
144 +++ createrepo_c/src/CMakeLists.txt 2013-12-01 16:53:42.373843363 +0100
146 TARGET_LINK_LIBRARIES(libcreaterepo_c ${LZMA_LIBRARIES})
147 TARGET_LINK_LIBRARIES(libcreaterepo_c ${OPENSSL_LIBRARIES})
148 TARGET_LINK_LIBRARIES(libcreaterepo_c ${RPMDB_LIBRARY})
149 +TARGET_LINK_LIBRARIES(libcreaterepo_c rpm)
150 TARGET_LINK_LIBRARIES(libcreaterepo_c ${SQLITE3_LIBRARIES})
151 TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY})