1 --- createrepo_c-0.10.0/src/misc.c.orig 2018-05-11 19:45:05.629153195 +0200
2 +++ createrepo_c-0.10.0/src/misc.c 2018-05-11 20:03:44.592473749 +0200
7 -#include <rpm/rpmlib.h>
8 +#include <rpm/rpmiotypes.h>
9 +#include <rpm/rpmevr.h>
13 --- createrepo_c/CMakeLists.txt.orig 2013-12-01 15:00:42.000000000 +0100
14 +++ createrepo_c/CMakeLists.txt 2013-12-01 16:21:27.510591230 +0100
17 include_directories(${GLIB2_INCLUDE_DIRS})
18 include_directories(${LIBXML2_INCLUDE_DIR})
20 +include_directories("/usr/include/rpm")
24 --- createrepo_c-0.10.0/src/parsehdr.h.orig 2018-05-11 19:45:05.632486529 +0200
25 +++ createrepo_c-0.10.0/src/parsehdr.h 2018-05-11 20:04:26.635806605 +0200
26 @@ -25,7 +25,7 @@ extern "C" {
30 -#include <rpm/rpmlib.h>
31 +#include <rpm/rpmtag.h>
34 /** \defgroup parsehdr Header parser API.
35 --- createrepo_c/src/parsehdr.c.orig 2013-12-01 15:00:42.000000000 +0100
36 +++ createrepo_c/src/parsehdr.c 2013-12-01 16:33:26.753894379 +0100
41 +#include <rpm/rpm46compat.h>
42 #include <rpm/rpmfi.h>
49 +static inline void* rpmtdNew(void)
51 + return malloc(sizeof(struct rpmtd_s));
54 +static inline void rpmtdFree(rpmtd td)
59 +static inline void rpmtdInit(rpmtd td)
64 +static inline const char * headerGetString(Header h, int32_t tag)
66 + const char *res = NULL;
69 + if (headerGet(h, tag, &td, HEADERGET_MINMEM)) {
70 + if (rpmtdCount(&td) == 1) {
71 + res = rpmtdGetString(&td);
78 +static inline uint64_t rpmtdGetNumber(rpmtd td)
83 + ix = (td->ix >= 0 ? td->ix : 0);
86 + case RPM_INT64_TYPE:
87 + val = *((uint64_t *) td->data + ix);
89 + case RPM_INT32_TYPE:
90 + val = *((uint32_t *) td->data + ix);
92 + case RPM_INT16_TYPE:
93 + val = *((uint16_t *) td->data + ix);
97 + val = *((uint8_t *) td->data + ix);
105 +static inline uint64_t headerGetNumber(Header h, int32_t tag)
110 + if (headerGet(h, tag, &td, HEADERGET_EXT)) {
111 + if (rpmtdCount(&td) == 1) {
112 + res = rpmtdGetNumber(&td);
114 + rpmtdFreeData(&td);
120 cr_compare_dependency(const char *dep1, const char *dep2)
122 --- createrepo_c-0.10.0/src/parsepkg.c.orig 2018-05-11 19:45:05.632486529 +0200
123 +++ createrepo_c-0.10.0/src/parsepkg.c 2018-05-11 20:05:28.922472561 +0200
126 #include <rpm/rpmts.h>
127 #include <rpm/rpmfi.h>
128 -#include <rpm/rpmlib.h>
129 #include <rpm/rpmmacro.h>
130 -#include <rpm/rpmkeyring.h>
131 +#include <rpm/rpmrc.h>
132 +#include <rpm/pkgio.h>
134 #include "parsehdr.h"
135 #include "parsepkg.h"
137 #define ERR_DOMAIN CREATEREPO_C_ERROR
140 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
141 +#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
146 --- createrepo_c/src/CMakeLists.txt.orig 2013-12-01 15:00:42.000000000 +0100
147 +++ createrepo_c/src/CMakeLists.txt 2013-12-01 16:53:42.373843363 +0100
149 TARGET_LINK_LIBRARIES(libcreaterepo_c ${LZMA_LIBRARIES})
150 TARGET_LINK_LIBRARIES(libcreaterepo_c ${OPENSSL_LIBRARIES})
151 TARGET_LINK_LIBRARIES(libcreaterepo_c ${RPMDB_LIBRARY})
152 +TARGET_LINK_LIBRARIES(libcreaterepo_c rpm)
153 TARGET_LINK_LIBRARIES(libcreaterepo_c ${SQLITE3_LIBRARIES})
154 TARGET_LINK_LIBRARIES(libcreaterepo_c ${ZLIB_LIBRARY})
157 --- createrepo_c-0.10.0/src/deltarpms.h.in.orig 2016-01-05 13:46:28.000000000 +0100
158 +++ createrepo_c-0.10.0/src/deltarpms.h.in 2018-05-11 20:54:15.319105812 +0200
159 @@ -25,7 +25,6 @@ extern "C" {
163 -#include <rpm/rpmlib.h>
165 #include "parsehdr.h"
166 #include "xml_file.h"
167 --- createrepo_c-0.10.0/src/dumper_thread.h.orig 2016-01-05 13:46:28.000000000 +0100
168 +++ createrepo_c-0.10.0/src/dumper_thread.h 2018-05-11 20:56:44.322437446 +0200
169 @@ -25,7 +25,6 @@ extern "C" {
173 -#include <rpm/rpmlib.h>
174 #include "load_metadata.h"
175 #include "locate_metadata.h"