diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/Makefile.am | 20 | ||||
| -rw-r--r-- | python/rpmbmodule.c | 4 | ||||
| -rw-r--r-- | python/rpmfd-py.c | 2 | ||||
| -rw-r--r-- | python/rpmii-py.c | 1 | ||||
| -rw-r--r-- | python/rpmmi-py.c | 1 | ||||
| -rw-r--r-- | python/rpmsmodule.c | 6 | ||||
| -rw-r--r-- | python/rpmsystem-py.h | 1 |
7 files changed, 17 insertions, 18 deletions
diff --git a/python/Makefile.am b/python/Makefile.am index 914bf3dca..1f2e596ac 100644 --- a/python/Makefile.am +++ b/python/Makefile.am @@ -7,17 +7,17 @@ AM_CPPFLAGS += -I$(top_srcdir)/python AM_CPPFLAGS += -I@WITH_PYTHON_INCLUDE@ AM_CPPFLAGS += -I$(top_srcdir) -rpmpyexec_LTLIBRARIES = _rpmmodule.la _rpmbmodule.la _rpmsmodule.la +rpmpyexec_LTLIBRARIES = _rpm.la _rpmb.la _rpms.la rpmpyexec_DATA = rpm/__init__.py rpm/transaction.py rpmpyexecdir = @pyexecdir@/@PYTHON_MODULENAME@ -_rpmmodule_la_LDFLAGS = -module -avoid-version -shared -_rpmmodule_la_LIBADD = \ +_rpm_la_LDFLAGS = -module -avoid-version -shared +_rpm_la_LIBADD = \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmio/librpmio.la \ @WITH_PYTHON_LIB@ -_rpmmodule_la_SOURCES = rpmmodule.c rpmsystem-py.h \ +_rpm_la_SOURCES = rpmmodule.c rpmsystem-py.h \ header-py.c header-py.h \ rpmds-py.c rpmds-py.h \ rpmfd-py.c rpmfd-py.h \ @@ -31,22 +31,22 @@ _rpmmodule_la_SOURCES = rpmmodule.c rpmsystem-py.h \ rpmte-py.c rpmte-py.h \ rpmts-py.c rpmts-py.h -_rpmbmodule_la_LDFLAGS = -module -avoid-version -shared -_rpmbmodule_la_LIBADD = \ +_rpmb_la_LDFLAGS = -module -avoid-version -shared +_rpmb_la_LIBADD = \ $(top_builddir)/build/librpmbuild.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmio/librpmio.la \ @WITH_PYTHON_LIB@ -_rpmbmodule_la_SOURCES = rpmbmodule.c rpmsystem-py.h \ +_rpmb_la_SOURCES = rpmbmodule.c rpmsystem-py.h \ spec-py.c spec-py.h -_rpmsmodule_la_LDFLAGS = -module -avoid-version -shared -_rpmsmodule_la_LIBADD = \ +_rpms_la_LDFLAGS = -module -avoid-version -shared +_rpms_la_LIBADD = \ $(top_builddir)/sign/librpmsign.la \ $(top_builddir)/lib/librpm.la \ $(top_builddir)/rpmio/librpmio.la \ @WITH_PYTHON_LIB@ -_rpmsmodule_la_SOURCES = rpmsmodule.c rpmsystem-py.h +_rpms_la_SOURCES = rpmsmodule.c rpmsystem-py.h diff --git a/python/rpmbmodule.c b/python/rpmbmodule.c index f6e149118..ad30570e4 100644 --- a/python/rpmbmodule.c +++ b/python/rpmbmodule.c @@ -66,8 +66,8 @@ static struct PyModuleDef moduledef = { NULL /* m_free */ }; -PyObject * PyInit__rpm(void); /* XXX eliminate gcc warning */ -PyObject * PyInit__rpm(void) +PyObject * PyInit__rpmb(void); /* XXX eliminate gcc warning */ +PyObject * PyInit__rpmb(void) { PyObject *m; diff --git a/python/rpmfd-py.c b/python/rpmfd-py.c index 79eb5b6ee..41f494108 100644 --- a/python/rpmfd-py.c +++ b/python/rpmfd-py.c @@ -230,7 +230,7 @@ static PyObject *rpmfd_read(rpmfdObject *s, PyObject *args, PyObject *kwds) if (nb > 0) { PyObject *tmp = PyBytes_FromStringAndSize(buf, nb); - PyString_ConcatAndDel(&res, tmp); + PyBytes_ConcatAndDel(&res, tmp); left -= nb; } } while (nb > 0); diff --git a/python/rpmii-py.c b/python/rpmii-py.c index 17fe79e98..9209b54e5 100644 --- a/python/rpmii-py.c +++ b/python/rpmii-py.c @@ -88,7 +88,6 @@ static PyNumberMethods rpmii_as_number = { 0, /* nb_add */ 0, /* nb_subtract */ 0, /* nb_multiply */ - 0, /* nb_divide */ 0, /* nb_remainder */ 0, /* nb_divmod */ 0, /* nb_power */ diff --git a/python/rpmmi-py.c b/python/rpmmi-py.c index 6c34c9876..70bb1665b 100644 --- a/python/rpmmi-py.c +++ b/python/rpmmi-py.c @@ -149,7 +149,6 @@ static PyNumberMethods rpmmi_as_number = { 0, /* nb_add */ 0, /* nb_subtract */ 0, /* nb_multiply */ - 0, /* nb_divide */ 0, /* nb_remainder */ 0, /* nb_divmod */ 0, /* nb_power */ diff --git a/python/rpmsmodule.c b/python/rpmsmodule.c index 3eb240314..a8289b5f6 100644 --- a/python/rpmsmodule.c +++ b/python/rpmsmodule.c @@ -59,15 +59,15 @@ static struct PyModuleDef moduledef = { "_rpms", /* m_name */ rpms__doc__, /* m_doc */ 0, /* m_size */ - NULL, /* m_methods */ + modMethods, /* m_methods */ NULL, /* m_reload */ NULL, /* m_traverse */ NULL, /* m_clear */ NULL /* m_free */ }; -PyObject * PyInit__rpm(void); /* XXX eliminate gcc warning */ -PyObject * PyInit__rpm(void) +PyObject * PyInit__rpms(void); /* XXX eliminate gcc warning */ +PyObject * PyInit__rpms(void) { PyObject *m; diff --git a/python/rpmsystem-py.h b/python/rpmsystem-py.h index c7286a24e..30f74561e 100644 --- a/python/rpmsystem-py.h +++ b/python/rpmsystem-py.h @@ -50,6 +50,7 @@ typedef Py_ssize_t (*lenfunc)(PyObject *); #define PyInt_FromLong PyLong_FromLong #define PyInt_AsUnsignedLongMask PyLong_AsUnsignedLongMask #define PyInt_AsUnsignedLongLongMask PyLong_AsUnsignedLongLongMask +#define PyInt_AsSsize_t PyLong_AsSsize_t #endif #endif /* H_SYSTEM_PYTHON */ |