]> git.pld-linux.org Git - packages/libsolv.git/blob - libsolv-rpm5.patch
- rel 8; fix build with rpm headers
[packages/libsolv.git] / libsolv-rpm5.patch
1 (partial, not finished: rpmdbIndex* and headerImport APIs are used)
2 --- libsolv-0.6.34/ext/repo_rpmdb_librpm.h.orig 2018-03-23 12:04:14.000000000 +0100
3 +++ libsolv-0.6.34/ext/repo_rpmdb_librpm.h      2018-05-10 20:28:01.213443653 +0200
4 @@ -15,6 +15,12 @@
5  #include <rpm/rpmts.h>
6  #include <rpm/rpmmacro.h>
7  
8 +#ifdef RPM5
9 +#define _RPMVSF_NOSIGNATURES (RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER | RPMVSF_NODSA | RPMVSF_NORSA)
10 +#define _RPMVSF_NODIGESTS (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NOSHA1 | RPMVSF_NOMD5)
11 +#define _RPMVSF_NOHEADER (RPMVSF_NOSHA1HEADER | RPMVSF_NOMD5HEADER | RPMVSF_NODSAHEADER | RPMVSF_NORSAHEADER)
12 +#endif
13 +
14  struct rpmdbstate {
15    Pool *pool;
16    char *rootdir;
17 --- libsolv-0.6.34/ext/repo_rpmdb.c.orig        2018-03-23 12:04:14.000000000 +0100
18 +++ libsolv-0.6.34/ext/repo_rpmdb.c     2018-05-10 19:30:12.563483259 +0200
19 @@ -30,6 +30,8 @@
20  #include <rpm/rpmpgp.h>
21  #ifndef RPM5
22  #include <rpm/header.h>
23 +#else
24 +#include <rpm/rpm46compat.h>
25  #endif
26  #include <rpm/rpmdb.h>
27  
28 @@ -457,7 +459,11 @@
29  static int
30  headissourceheuristic(RpmHead *h)
31  {
32 +#ifdef RPM5
33 +  return !headerIsEntry(h, RPMTAG_SOURCERPM);
34 +#else
35    return headerIsSource(h);
36 +#endif
37  }
38  
39  static inline void
This page took 0.0616679999999999 seconds and 3 git commands to generate.