Get rpmcli.h includes out of python bindings

diff --git a/python/header-py.c b/python/header-py.c
index ff23316..2c42ba8 100644 (file)
--- a/python/header-py.c
+++ b/python/header-py.c
@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include "rpmio_internal.h"
-#include "rpmcli.h"    /* XXX for rpmCheckSig */
+#include "rpmlib.h"
 
 #include "legacy.h"
 #include "misc.h"

diff --git a/python/header-py.h b/python/header-py.h
index 7c470f0..20aa8b1 100644 (file)
--- a/python/header-py.h
+++ b/python/header-py.h
@@ -1,6 +1,8 @@
 #ifndef RPMPYTHON_HEADER
 #define RPMPYTHON_HEADER
 
+#include <rpmlib.h>
+
 /** \ingroup py_c
  * \file python/header-py.h
  */

diff --git a/python/rpmdebug-py.c b/python/rpmdebug-py.c
index 1ddab21..8a78107 100644 (file)
--- a/python/rpmdebug-py.c
+++ b/python/rpmdebug-py.c
@@ -6,8 +6,6 @@ extern PyTypeObject PyDictIter_Type;
 /*@unchecked@*/
 extern PyTypeObject PyFrame_Type;
 
-#include <rpmcli.h>    /* XXX debug only */
-
 #include "header-py.h" /* XXX debug only */
 #include "rpmal-py.h"  /* XXX debug only */
 #include "rpmds-py.h"  /* XXX debug only */

diff --git a/python/rpmmodule.c b/python/rpmmodule.c
index 2a0ee11..343e26a 100644 (file)
--- a/python/rpmmodule.c
+++ b/python/rpmmodule.c
@@ -5,7 +5,6 @@
 #include "system.h"
 
 #include <rpmio_internal.h>
-#include <rpmcli.h>    /* XXX for rpmCheckSig */
 #include <rpmdb.h>
 #include <rpmsq.h>
 

diff --git a/python/rpmrc-py.c b/python/rpmrc-py.c
index 458e827..ead1a92 100644 (file)
--- a/python/rpmrc-py.c
+++ b/python/rpmrc-py.c
@@ -7,10 +7,8 @@
 #include "structmember.h"
 
 #include "rpmdebug-py.c"
-
-#include <rpmcli.h>
-
 #include "rpmrc-py.h"
+#include "rpmmacro.h"
 
 #include "debug.h"