folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Automated merge with file:/home/pmatilai/repos/rpm-ioclean

This commit is contained in:
Panu Matilainen 2007-09-12 12:26:15 +03:00
parent 9f325855d7 fb7433b364
commit 1180de589b
14 changed files with 57 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
Makefile.am
View File

@ -7,7 +7,7 @@ EXTRA_DIST = CHANGES ChangeLog CREDITS Doxyheader GROUPS INSTALL \
autodeps autogen.sh \
db db3/configure installplatform platform*
SUBDIRS = po misc @WITH_DB_SUBDIR@ lua rpmio rpmdb lib build python tools scripts doc . tests
SUBDIRS = po misc @WITH_DB_SUBDIR@ lua rpmio rpmdb lib build python scripts doc . tests
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = rpm.pc
@ -82,11 +82,37 @@ debugedit_LDADD = @WITH_LIBELF_LIB@ @WITH_BEECRYPT_LIB@ @WITH_POPT_LIB@
endif
endif
rpmlibexec_PROGRAMS += javadeps
javadeps_SOURCES = tools/javadeps.c
javadeps_LDADD =
rpmlibexec_PROGRAMS += rpmcache
rpmcache_SOURCES = tools/rpmcache.c
rpmcache_LDADD = lib/librpm.la
rpmlibexec_PROGRAMS += rpmdeps
rpmdeps_SOURCES = tools/rpmdeps.c
rpmdeps_LDADD = build/librpmbuild.la
bin_PROGRAMS += rpmgraph
rpmgraph_SOURCES = tools/rpmgraph.c
rpmgraph_LDADD = lib/librpm.la
check_PROGRAMS = dumpdb
dumpdb_SOURCES = tools/dumpdb.c
dumpdb_LDADD =
check_PROGRAMS += convertdb1
convertdb1_SOURCES = tools/convertdb1.c
convertdb1_LDADD =
check_PROGRAMS += rpminject
rpminject_SOURCES = tools/rpminject.c
rpminject_LDADD = build/librpmbuild.la
check_PROGRAMS += rpmsort
rpmsort_SOURCES = tools/rpmsort.c
rpmsort_LDADD =
rpmrc: $(top_srcdir)/rpmrc.in
@sed \

1
configure.ac
View File

@ -1069,7 +1069,6 @@ AC_PATH_PROG(AUTOM4TE,autom4te,:)
AC_CONFIG_FILES([ Doxyfile Makefile platform rpm.pc
rpmio/Makefile rpmdb/Makefile lib/Makefile build/Makefile
po/Makefile.in scripts/Makefile
tools/Makefile
misc/Makefile
doc/Makefile
python/Makefile

36
python/header-py.h
View File

@ -17,32 +17,20 @@ extern PyTypeObject hdr_Type;
*/
extern PyObject * pyrpmError;
hdrObject * hdr_Wrap(Header h)
;
hdrObject * hdr_Wrap(Header h);
Header hdrGetHeader(hdrObject * h)
;
Header hdrGetHeader(hdrObject * h);
long tagNumFromPyObject (PyObject *item)
;
long tagNumFromPyObject (PyObject *item);
PyObject * labelCompare (PyObject * self, PyObject * args)
;
PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args, PyObject * kwds)
;
int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag)
;
PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * rpmSingleHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * rpmReadHeaders (FD_t fd)
;
PyObject * hdrLoad(PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * labelCompare (PyObject * self, PyObject * args);
PyObject * versionCompare (PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rpmMergeHeadersFromFD(PyObject * self, PyObject * args, PyObject * kwds);
int rpmMergeHeaders(PyObject * list, FD_t fd, int matchTag);
PyObject * rpmHeaderFromFile(PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rpmHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rpmSingleHeaderFromFD(PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rpmReadHeaders (FD_t fd);
PyObject * hdrLoad(PyObject * self, PyObject * args, PyObject * kwds);
#endif

3
python/rpmal-py.h
View File

@ -15,7 +15,6 @@ typedef struct rpmalObject_s {
extern PyTypeObject rpmal_Type;
rpmalObject * rpmal_Wrap(rpmal al)
;
rpmalObject * rpmal_Wrap(rpmal al);
#endif

6
python/rpmdb-py.h
View File

@ -25,11 +25,9 @@ struct rpmdbObject_s {
extern PyTypeObject rpmdb_Type;
#ifdef _LEGACY_BINDINGS_TOO
rpmdb dbFromDb(rpmdbObject * db)
;
rpmdb dbFromDb(rpmdbObject * db);
rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args, PyObject * kwds)
;
rpmdbObject * rpmOpenDB(PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rebuildDB (PyObject * self, PyObject * args, PyObject * kwds);
#endif

15
python/rpmds-py.h
View File

@ -22,27 +22,22 @@ extern PyTypeObject rpmds_Type;
/**
*/
rpmds dsFromDs(rpmdsObject * ds)
;
rpmds dsFromDs(rpmdsObject * ds);
/**
*/
rpmdsObject * rpmds_Wrap(rpmds ds)
;
rpmdsObject * rpmds_Wrap(rpmds ds);
/**
*/
rpmdsObject * rpmds_Single(PyObject * s, PyObject * args, PyObject * kwds)
;
rpmdsObject * rpmds_Single(PyObject * s, PyObject * args, PyObject * kwds);
/**
*/
rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args, PyObject * kwds)
;
rpmdsObject * hdr_dsFromHeader(PyObject * s, PyObject * args, PyObject * kwds);
/**
*/
rpmdsObject * hdr_dsOfHeader(PyObject * s)
;
rpmdsObject * hdr_dsOfHeader(PyObject * s);
#endif

3
python/rpmfd-py.h
View File

@ -13,7 +13,6 @@ typedef struct rpmfdObject_s {
extern PyTypeObject rpmfd_Type;
rpmfdObject * rpmfd_Wrap(FD_t fd)
;
rpmfdObject * rpmfd_Wrap(FD_t fd);
#endif

6
python/rpmfi-py.h
View File

@ -16,11 +16,9 @@ typedef struct rpmfiObject_s {
extern PyTypeObject rpmfi_Type;
rpmfi fiFromFi(rpmfiObject * fi)
;
rpmfi fiFromFi(rpmfiObject * fi);
rpmfiObject * rpmfi_Wrap(rpmfi fi)
;
rpmfiObject * rpmfi_Wrap(rpmfi fi);
rpmfiObject * hdr_fiFromHeader(PyObject * s, PyObject * args, PyObject * kwds);

3
python/rpmmi-py.h
View File

@ -20,7 +20,6 @@ struct rpmmiObject_s {
extern PyTypeObject rpmmi_Type;
rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s)
;
rpmmiObject * rpmmi_Wrap(rpmdbMatchIterator mi, PyObject *s);
#endif

6
python/rpmmpw-py.h
View File

@ -29,12 +29,10 @@ extern PyTypeObject mpw_Type;
/**
*/
mpwObject * mpw_New(int ob_size)
;
mpwObject * mpw_New(int ob_size);
/**
*/
mpwObject * mpw_FromMPW(size_t size, mpw* data, int normalize)
;
mpwObject * mpw_FromMPW(size_t size, mpw* data, int normalize);
#endif

6
python/rpmps-py.h
View File

@ -23,12 +23,10 @@ extern PyTypeObject rpmps_Type;
/**
*/
rpmps psFromPs(rpmpsObject * ps)
;
rpmps psFromPs(rpmpsObject * ps);
/**
*/
rpmpsObject * rpmps_Wrap(rpmps ps)
;
rpmpsObject * rpmps_Wrap(rpmps ps);
#endif

3
python/rpmrc-py.h
View File

@ -26,8 +26,7 @@ PyObject * rpmrc_AddMacro(PyObject * self, PyObject * args, PyObject * kwds);
PyObject * rpmrc_DelMacro(PyObject * self, PyObject * args, PyObject * kwds);
#if Py_TPFLAGS_HAVE_ITER /* XXX backport to python-1.5.2 */
PyObject * rpmrc_Create(PyObject * self, PyObject * args, PyObject * kwds)
;
PyObject * rpmrc_Create(PyObject * self, PyObject * args, PyObject * kwds);
#endif
#endif

3
python/rpmte-py.h
View File

@ -15,7 +15,6 @@ typedef struct rpmteObject_s {
extern PyTypeObject rpmte_Type;
rpmteObject * rpmte_Wrap(rpmte te)
;
rpmteObject * rpmte_Wrap(rpmte te);
#endif

46
tools/Makefile.am
View File

@ -1,46 +0,0 @@
# Makefile for rpm tools.
include $(top_srcdir)/rpm.am
AM_CPPFLAGS = -I. \
-I$(top_srcdir) \
-I$(top_srcdir)/build \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/rpmdb \
-I$(top_srcdir)/rpmio \
@WITH_BEECRYPT_INCLUDE@ \
@WITH_POPT_INCLUDE@ \
@WITH_LIBELF_INCLUDE@ \
@WITH_MAGIC_INCLUDE@ \
-I$(top_srcdir)/misc
AM_CPPFLAGS += -DLOCALEDIR="\"$(localedir)\""
EXTRA_PROGRAMS =
LDADD = ../lib/librpm.la
staticLDFLAGS = @LDFLAGS_STATIC@ @LDFLAGS_NPTL@
check_PROGRAMS = dumpdb
rpmlibexec_PROGRAMS =
check_PROGRAMS += convertdb1
convertdb1_SOURCES = convertdb1.c
rpmlibexec_PROGRAMS += javadeps
javadeps_SOURCES = javadeps.c
rpmlibexec_PROGRAMS += rpmcache
rpmcache_SOURCES = rpmcache.c
rpmlibexec_PROGRAMS += rpmdeps
rpmdeps_SOURCES = rpmdeps.c
rpmdeps_LDADD = ../build/librpmbuild.la
check_PROGRAMS += rpminject
rpminject_SOURCES = rpminject.c
rpminject_LDADD = ../build/librpmbuild.la
check_PROGRAMS += rpmsort
rpmsort_SOURCES = rpmsort.c