Switch to <rpm/foo.h> style for public headers
- adjust include paths accordingly
This commit is contained in:
parent
179ebc1745
commit
9ce13e09ef
|
@ -20,7 +20,7 @@ DIST_SUBDIRS = po misc db3 lua rpmio rpmdb lib build python scripts doc tests
|
|||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/build
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/lib
|
||||
AM_CPPFLAGS += -I$(top_builddir)/rpmdb -I$(top_srcdir)/rpmdb
|
||||
|
|
14
build.c
14
build.c
|
@ -4,16 +4,16 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
|
||||
#include <rpmps.h>
|
||||
#include <rpmte.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmps.h>
|
||||
#include <rpm/rpmte.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
|
||||
#include "build.h"
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile for rpmbuild library.
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_MAGIC_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -8,7 +8,7 @@
|
|||
* @todo Eliminate, merge into rpmlib.
|
||||
*/
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -13,9 +13,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlib.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -10,25 +10,25 @@
|
|||
|
||||
#include <regex.h>
|
||||
|
||||
#include <rpmpgp.h>
|
||||
#include <rpm/rpmpgp.h>
|
||||
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
|
||||
#include "rpmio/fts.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
|
||||
#include "lib/cpio.h"
|
||||
|
||||
#include <argv.h>
|
||||
#include <rpmfc.h>
|
||||
#include <rpm/argv.h>
|
||||
#include <rpm/rpmfc.h>
|
||||
|
||||
#include "lib/rpmfi_internal.h" /* XXX pretty much all rpmfi internals... */
|
||||
#include "lib/rpmte_internal.h" /* XXX rpmte init */
|
||||
|
||||
#include "build/buildio.h"
|
||||
|
||||
#include <rpmfileutil.h> /* rpmDoDigest() */
|
||||
#include <rpm/rpmfileutil.h> /* rpmDoDigest() */
|
||||
#include "lib/legacy.h" /* XXX expandFileList, compressFileList */
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; }
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
*/
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include "debug.h"
|
||||
|
||||
int parseNum(const char * line, int * res)
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
typedef const char * ugstr_t;
|
||||
|
|
|
@ -6,21 +6,21 @@
|
|||
#include "system.h"
|
||||
|
||||
#include "rpmio/rpmio_internal.h" /* fdInitDigest, fdFiniDigest */
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
|
||||
#include "lib/cpio.h"
|
||||
#include "lib/fsm.h"
|
||||
|
||||
#include "lib/rpmfi_internal.h" /* XXX fi->fsm */
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "build/buildio.h"
|
||||
|
||||
#include "lib/legacy.h" /* XXX providePackageNVR */
|
||||
#include "lib/signature.h"
|
||||
#include "lib/rpmlead.h"
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
*/
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; }
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
extern int noLang;
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "debug.h"
|
||||
|
||||
/* These have to be global scope to make up for *stupid* compilers */
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; }
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "debug.h"
|
||||
|
||||
/* These have to be global to make up for stupid compilers */
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
/**
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
#include "rpmio/rpmlua.h"
|
||||
|
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define SKIPSPACE(s) { while (*(s) && xisspace(*(s))) (s)++; }
|
||||
|
|
|
@ -5,9 +5,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
struct rpmBuildArguments_s rpmBTArgs;
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include "debug.h"
|
||||
|
||||
int addReqProv(rpmSpec spec, Header h, rpmTag tagN,
|
||||
|
|
|
@ -6,14 +6,14 @@
|
|||
* This is the *only* module users of librpmbuild should need to include.
|
||||
*/
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
/* and it shouldn't need these :-( */
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
/* but this will be needed */
|
||||
#include <rpmspec.h>
|
||||
#include <rpm/rpmspec.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -2,13 +2,13 @@
|
|||
|
||||
#include <signal.h> /* getOutputFrom() */
|
||||
|
||||
#include <rpmbuild.h>
|
||||
#include <argv.h>
|
||||
#include <rpmfc.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmbuild.h>
|
||||
#include <rpm/argv.h>
|
||||
#include <rpm/rpmfc.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#if HAVE_GELF_H
|
||||
#include <gelf.h>
|
||||
|
|
|
@ -8,10 +8,10 @@
|
|||
|
||||
#include <magic.h>
|
||||
|
||||
#include <rpmlib.h> /* for rpmds, rpmSpec */
|
||||
#include <argv.h> /* for ARGV_t */
|
||||
#include <rpmstring.h> /* for StringBuf */
|
||||
#include <rpmspec.h> /* for Package */
|
||||
#include <rpm/rpmlib.h> /* for rpmds, rpmSpec */
|
||||
#include <rpm/argv.h> /* for ARGV_t */
|
||||
#include <rpm/rpmstring.h> /* for StringBuf */
|
||||
#include <rpm/rpmspec.h> /* for Package */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
* The rpmSpec and Package data structures used during build.
|
||||
*/
|
||||
|
||||
#include <rpmstring.h> /* StringBuf */
|
||||
#include <rpmcli.h> /* for QVA_t */
|
||||
#include <rpm/rpmstring.h> /* StringBuf */
|
||||
#include <rpm/rpmcli.h> /* for QVA_t */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
10
build/spec.c
10
build/spec.c
|
@ -6,11 +6,11 @@
|
|||
#include "system.h"
|
||||
|
||||
#include "build/buildio.h"
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
# Makefile for rpm library.
|
||||
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_POPT_INCLUDE@
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/misc
|
||||
|
|
|
@ -9,12 +9,12 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "lib/cpio.h"
|
||||
#include "lib/fsm.h"
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
|
|
|
@ -4,16 +4,16 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h> /* XXX rpmcliPackagesTotal */
|
||||
#include <rpm/rpmcli.h> /* XXX rpmcliPackagesTotal */
|
||||
|
||||
#include <rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX rpmExpand("%{_dependency_whiteout}" */
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include "rpmdb/rpmdb_internal.h" /* XXX response cache needs dbiOpen et al. */
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#include "lib/rpmte_internal.h" /* XXX tsortInfo_s */
|
||||
#include "lib/rpmts_internal.h"
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
#include "system.h"
|
||||
#include "rpmio/digest.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpmmacro.h> /* XXX for %_i18ndomains */
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX for %_i18ndomains */
|
||||
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#include "lib/manifest.h"
|
||||
|
||||
|
|
6
lib/fs.c
6
lib/fs.c
|
@ -3,9 +3,9 @@
|
|||
*/
|
||||
|
||||
#include "system.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpmfileutil.h> /* for rpmGetPath */
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmfileutil.h> /* for rpmGetPath */
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
|
||||
|
|
10
lib/fsm.c
10
lib/fsm.c
|
@ -6,19 +6,19 @@
|
|||
#include "system.h"
|
||||
|
||||
#include "rpmio/rpmio_internal.h" /* fdGet/SetCpioPos, fdInit/FiniDigest */
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "lib/cpio.h"
|
||||
|
||||
#include "lib/fsm.h"
|
||||
#define fsmUNSAFE fsmStage
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "lib/rpmfi_internal.h" /* XXX fi->apath, fi->action... */
|
||||
#include <rpmte.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmsq.h>
|
||||
#include <rpm/rpmte.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmsq.h>
|
||||
|
||||
#include "rpmio/ugid.h" /* XXX unameToUid() and gnameToGid() */
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
*/
|
||||
|
||||
#include "lib/cpio.h"
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
extern int _fsm_debug;
|
||||
|
||||
|
|
12
lib/idtx.c
12
lib/idtx.c
|
@ -1,11 +1,11 @@
|
|||
#include "system.h"
|
||||
|
||||
#include <idtx.h>
|
||||
#include <rpmlib.h>
|
||||
#include <rpmdb.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/idtx.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
static int reverse = -1;
|
||||
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef H_RPMIDTX
|
||||
#define H_RPMIDTX
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
10
lib/legacy.c
10
lib/legacy.c
|
@ -4,11 +4,11 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include "lib/legacy.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
#include "lib/manifest.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -7,10 +7,10 @@
|
|||
/* just to put a marker in librpm.a */
|
||||
const char * RPMVERSION = VERSION;
|
||||
|
||||
#include <rpmurl.h>
|
||||
#include <rpmmacro.h> /* XXX for rpmGetPath */
|
||||
#include <rpmlib.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmurl.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX for rpmGetPath */
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "lib/misc.h"
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -8,14 +8,14 @@
|
|||
|
||||
#include "rpmio/digest.h"
|
||||
#include "rpmio/rpmio_internal.h" /* fd*Digest(), fd stats */
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "lib/legacy.h" /* XXX legacyRetrofit() */
|
||||
#include "lib/rpmlead.h"
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "rpmdb/header_internal.h" /* XXX headerCheck */
|
||||
#include "lib/signature.h"
|
||||
#include "debug.h"
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#include "system.h"
|
||||
const char *__progname;
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpmgi.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmgi.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -5,8 +5,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpmgi.h> /* XXX for giFlags */
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmgi.h> /* XXX for giFlags */
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
16
lib/psm.c
16
lib/psm.c
|
@ -5,30 +5,30 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmurl.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmurl.h>
|
||||
#include "rpmio/rpmlua.h"
|
||||
|
||||
#include "lib/cpio.h"
|
||||
#include "lib/fsm.h" /* XXX CPIO_FOO/FSM_FOO constants */
|
||||
#include "lib/psm.h"
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "lib/rpmfi_internal.h" /* XXX replaced/states, fi->hge, fi->te... */
|
||||
|
||||
#include "lib/rpmte_internal.h" /* XXX te->fd */
|
||||
|
||||
#include "lib/rpmtsscore.h"
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "lib/rpmlead.h" /* writeLead proto */
|
||||
#include "lib/signature.h" /* signature constants */
|
||||
#include <rpmfileutil.h> /* rpmMkTempFile() */
|
||||
#include <rpm/rpmfileutil.h> /* rpmMkTempFile() */
|
||||
#include "lib/misc.h" /* XXX rpmMkdirPath, doputenv */
|
||||
#include <rpmdb.h> /* XXX for db_chrootDone */
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmdb.h> /* XXX for db_chrootDone */
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define _PSM_DEBUG 0
|
||||
|
|
|
@ -7,8 +7,8 @@
|
|||
*/
|
||||
|
||||
#define _RPMSQ_INTERNAL
|
||||
#include <rpmsq.h>
|
||||
#include <rpmcallback.h>
|
||||
#include <rpm/rpmsq.h>
|
||||
#include <rpm/rpmcallback.h>
|
||||
|
||||
extern int _psm_debug;
|
||||
|
||||
|
|
14
lib/query.c
14
lib/query.c
|
@ -9,17 +9,17 @@
|
|||
# define PATH_MAX 255
|
||||
#endif
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#include <rpmgi.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmgi.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "lib/manifest.h"
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h> /* rpmCleanPath */
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h> /* rpmCleanPath */
|
||||
|
||||
#include "debug.h"
|
||||
#include "lib/misc.h" /* XXX for currentDirectory */
|
||||
|
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmal.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmal.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
* Structures used for managing added/available package lists.
|
||||
*/
|
||||
|
||||
#include <rpmlib.h> /* for rpmds, rpmfi, uint32_t */
|
||||
#include <rpmcallback.h> /* for fnpyKey */
|
||||
#include <rpm/rpmlib.h> /* for rpmds, rpmfi, uint32_t */
|
||||
#include <rpm/rpmcallback.h> /* for fnpyKey */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -5,18 +5,18 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmpgp.h>
|
||||
#include <rpm/rpmpgp.h>
|
||||
#include "rpmio/rpmio_internal.h" /* for fd*Digest() */
|
||||
#include <rpmcli.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "lib/rpmlead.h"
|
||||
#include "lib/signature.h"
|
||||
#include <rpmfileutil.h> /* rpmMkTempFile() */
|
||||
#include <rpm/rpmfileutil.h> /* rpmMkTempFile() */
|
||||
#include "debug.h"
|
||||
|
||||
int _print_pkts = 0;
|
||||
|
|
14
lib/rpmcli.h
14
lib/rpmcli.h
|
@ -5,13 +5,13 @@
|
|||
* \file lib/rpmcli.h
|
||||
*/
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmurl.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmcallback.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmfi.h>
|
||||
#include <argv.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmurl.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmcallback.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include <rpm/argv.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -3,11 +3,11 @@
|
|||
*/
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -6,8 +6,8 @@
|
|||
* Structure(s) used for dependency tag sets.
|
||||
*/
|
||||
|
||||
#include <rpmlib.h> /* for rpmds */
|
||||
#include <rpmps.h>
|
||||
#include <rpm/rpmlib.h> /* for rpmds */
|
||||
#include <rpm/rpmps.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
14
lib/rpmfi.c
14
lib/rpmfi.c
|
@ -5,22 +5,22 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "lib/cpio.h" /* XXX CPIO_FOO */
|
||||
#include "lib/fsm.h" /* XXX newFSM() */
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "lib/rpmfi_internal.h"
|
||||
|
||||
#include "lib/rpmte_internal.h" /* relocations */
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include <rpmfileutil.h>/* XXX domd5 */
|
||||
#include <rpmstring.h>
|
||||
#include <rpmmacro.h> /* XXX rpmCleanPath */
|
||||
#include <rpm/rpmfileutil.h>/* XXX domd5 */
|
||||
#include <rpm/rpmstring.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX rpmCleanPath */
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Structure(s) used for file info tag sets.
|
||||
*/
|
||||
|
||||
#include <rpmlib.h> /* for rpmfi */
|
||||
#include <rpm/rpmlib.h> /* for rpmfi */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _RPMFI_INTERNAL_H
|
||||
#define _RPMFI_INTERNAL_H
|
||||
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
/**
|
||||
*/
|
||||
|
|
14
lib/rpmgi.c
14
lib/rpmgi.c
|
@ -3,17 +3,17 @@
|
|||
*/
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmte.h> /* XXX rpmElementType */
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmte.h> /* XXX rpmElementType */
|
||||
|
||||
#include <rpmgi.h>
|
||||
#include <rpm/rpmgi.h>
|
||||
#include "rpmio/fts.h"
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpmmacro.h> /* XXX rpmExpand */
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX rpmExpand */
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "lib/manifest.h"
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -5,10 +5,10 @@
|
|||
* \file lib/rpmgi.h
|
||||
*/
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmte.h>
|
||||
#include <rpmts.h>
|
||||
#include <argv.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmte.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/argv.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -4,14 +4,14 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <idtx.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include <rpm/idtx.h>
|
||||
|
||||
#include "lib/manifest.h"
|
||||
#include "debug.h"
|
||||
|
|
|
@ -6,12 +6,12 @@
|
|||
|
||||
#include <netinet/in.h>
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "lib/signature.h"
|
||||
#include "lib/rpmlead.h"
|
||||
#include "lib/legacy.h"
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
static unsigned char lead_magic[] = {
|
||||
|
|
|
@ -21,7 +21,7 @@ extern "C" {
|
|||
|
||||
typedef struct rpmlead_s * rpmlead;
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
/** \ingroup lead
|
||||
* Initialize a lead structure
|
||||
|
|
|
@ -8,9 +8,9 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include <rpmio.h>
|
||||
#include <header.h>
|
||||
#include <rpmtag.h>
|
||||
#include <rpm/rpmio.h>
|
||||
#include <rpm/header.h>
|
||||
#include <rpm/rpmtag.h>
|
||||
#include <popt.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -1,12 +1,12 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include "lib/rpmlock.h"
|
||||
|
||||
#include "debug.h"
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmps.h>
|
||||
#include <rpm/rpmps.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Structures and prototypes used for an "rpmps" problem set.
|
||||
*/
|
||||
|
||||
#include <rpmcallback.h> /* for fnpyKey */
|
||||
#include <rpm/rpmcallback.h> /* for fnpyKey */
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
10
lib/rpmrc.c
10
lib/rpmrc.c
|
@ -14,13 +14,13 @@
|
|||
#endif
|
||||
|
||||
#include "rpmio/rpmio_internal.h" /* XXX for rpmioSlurp */
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
#include "rpmio/rpmlua.h"
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "debug.h"
|
||||
|
||||
static const char *defrcfiles =
|
||||
|
|
|
@ -3,13 +3,13 @@
|
|||
* Routine(s) to handle an "rpmte" transaction element.
|
||||
*/
|
||||
#include "system.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
#include "lib/rpmte_internal.h"
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Structures used for an "rpmte" transaction element.
|
||||
*/
|
||||
|
||||
#include <rpmal.h>
|
||||
#include <rpm/rpmal.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef _RPMTE_INTERNAL_H
|
||||
#define _RPMTE_INTERNAL_H
|
||||
|
||||
#include <rpmte.h>
|
||||
#include <rpm/rpmte.h>
|
||||
|
||||
/** \ingroup rpmte
|
||||
* Dependncy ordering information.
|
||||
|
|
22
lib/rpmts.c
22
lib/rpmts.c
|
@ -4,22 +4,22 @@
|
|||
*/
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmurl.h>
|
||||
#include <rpm/rpmurl.h>
|
||||
#include "rpmio/digest.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmfileutil.h> /* rpmtsOpenDB() needs rpmGetPath */
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmfileutil.h> /* rpmtsOpenDB() needs rpmGetPath */
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
|
||||
#include <rpmal.h>
|
||||
#include <rpmds.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmal.h>
|
||||
#include <rpm/rpmds.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include "lib/rpmlock.h"
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include <rpmte.h>
|
||||
#include <rpm/rpmte.h>
|
||||
|
||||
#include "lib/rpmts_internal.h"
|
||||
|
||||
|
|
12
lib/rpmts.h
12
lib/rpmts.h
|
@ -6,12 +6,12 @@
|
|||
* Structures and prototypes used for an "rpmts" transaction set.
|
||||
*/
|
||||
|
||||
#include <rpmlib.h> /* for rpmts */
|
||||
#include <rpmps.h>
|
||||
#include <rpmsw.h>
|
||||
#include <rpmpgp.h>
|
||||
#include <rpmfi.h>
|
||||
#include <rpmcallback.h>
|
||||
#include <rpm/rpmlib.h> /* for rpmts */
|
||||
#include <rpm/rpmps.h>
|
||||
#include <rpm/rpmsw.h>
|
||||
#include <rpm/rpmpgp.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include <rpm/rpmcallback.h>
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#ifndef _RPMTS_INTERNAL_H
|
||||
#define _RPMTS_INTERNAL_H
|
||||
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include "rpmdb/rpmhash.h" /* XXX hashTable */
|
||||
#include <rpmal.h> /* XXX availablePackage/relocateFileList ,*/
|
||||
#include <rpm/rpmal.h> /* XXX availablePackage/relocateFileList ,*/
|
||||
#include "lib/rpmtsscore.h" /* for rpmtsScore */
|
||||
|
||||
extern int _cacheDependsRC;
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef H_RPMTSSCORE
|
||||
#define H_RPMTSSCORE
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmte.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmte.h>
|
||||
|
||||
/**********************
|
||||
* Transaction Scores *
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -5,16 +5,16 @@
|
|||
#include "system.h"
|
||||
|
||||
#include "rpmio/digest.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h> /* XXX for rpmGetPath() */
|
||||
#include <rpmdb.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX for rpmGetPath() */
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
#include "lib/misc.h" /* XXX for dosetenv() */
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "lib/rpmlead.h"
|
||||
#include "lib/signature.h"
|
||||
#include "rpmdb/header_internal.h"
|
||||
|
|
|
@ -6,7 +6,7 @@
|
|||
* Generate and verify signatures.
|
||||
*/
|
||||
|
||||
#include <header.h>
|
||||
#include <rpm/header.h>
|
||||
|
||||
/** \ingroup signature
|
||||
* Signature types stored in rpm lead.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "system.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include "debug.h"
|
||||
|
||||
#define _PROC_CPUINFO "/proc/cpuinfo"
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -1,11 +1,11 @@
|
|||
#include "system.h"
|
||||
|
||||
#include <rpmgi.h>
|
||||
#include <rpmcli.h>
|
||||
#include <rpm/rpmgi.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
|
||||
#include <rpmte.h>
|
||||
#include <rpm/rpmte.h>
|
||||
|
||||
#include <rpmmacro.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include "rpmio/fts.h"
|
||||
#include <popt.h>
|
||||
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
#include "system.h"
|
||||
|
||||
#include "rpmio/rpmio_internal.h" /* XXX rpmioSlurp */
|
||||
#include <rpmlib.h>
|
||||
#include <rpmmacro.h>
|
||||
#include <rpmio.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
#include <rpm/rpmio.h>
|
||||
|
||||
#define _ETC_RPM_PLATFORM "/etc/rpm/platform"
|
||||
static const char * platform = _ETC_RPM_PLATFORM;
|
||||
|
|
|
@ -3,18 +3,18 @@
|
|||
*/
|
||||
|
||||
#include "system.h"
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include <rpmmacro.h> /* XXX for rpmExpand */
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmmacro.h> /* XXX for rpmExpand */
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "lib/fsm.h"
|
||||
#include "lib/psm.h"
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include "rpmdb/rpmdb_internal.h" /* XXX for dbiIndexSetCount */
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
#include "lib/rpmlock.h"
|
||||
|
||||
|
@ -26,13 +26,13 @@
|
|||
|
||||
#include "lib/cpio.h"
|
||||
#include "rpmdb/fprint.h"
|
||||
#include <rpmfileutil.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
#include "lib/misc.h" /* currentDirectory */
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
#include <idtx.h>
|
||||
#include <rpm/idtx.h>
|
||||
|
||||
/**
|
||||
*/
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#include "system.h"
|
||||
#include <rpmcli.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
#include <pthread.h>
|
||||
|
||||
#include <rpmsq.h>
|
||||
#include <rpm/rpmsq.h>
|
||||
#include <popt.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
#include <pthread.h>
|
||||
#include <assert.h>
|
||||
#include <rpmlib.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpmsq.h> /* XXX for _rpmsq_debug */
|
||||
#include <rpmio.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmts.h>
|
||||
#include <rpm/rpmsq.h> /* XXX for _rpmsq_debug */
|
||||
#include <rpm/rpmio.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
10
lib/verify.c
10
lib/verify.c
|
@ -5,14 +5,14 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmcli.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmcli.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "lib/psm.h"
|
||||
#include <rpmfi.h>
|
||||
#include <rpmts.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
#include <rpm/rpmts.h>
|
||||
|
||||
#include "rpmfileutil.h"
|
||||
#include <rpm/rpmfileutil.h>
|
||||
#include "rpmio/ugid.h" /* uidToUname(), gnameToGid */
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
EXTRA_DIST = rpmdebug-py.c rpm/__init__.py
|
||||
|
||||
if PYTHON
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/rpm
|
||||
AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) -I$(top_builddir)/include/
|
||||
AM_CPPFLAGS += -I$(top_srcdir)/python
|
||||
AM_CPPFLAGS += @WITH_LIBELF_INCLUDE@
|
||||
AM_CPPFLAGS += @WITH_NSS_INCLUDE@
|
||||
|
|
|
@ -4,12 +4,12 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
#include "lib/legacy.h" /* XXX expand/compressFilelist(), providePackageNVR() */
|
||||
|
||||
#include <rpmts.h> /* XXX rpmtsCreate/rpmtsFree */
|
||||
#include <rpm/rpmts.h> /* XXX rpmtsCreate/rpmtsFree */
|
||||
|
||||
#include "header-py.h"
|
||||
#include "rpmds-py.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef RPMPYTHON_HEADER
|
||||
#define RPMPYTHON_HEADER
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
/** \ingroup py_c
|
||||
* \file python/header-py.h
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "rpmal-py.h"
|
||||
#include "rpmds-py.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef H_RPMAL_PY
|
||||
#define H_RPMAL_PY
|
||||
|
||||
#include <rpmal.h>
|
||||
#include <rpm/rpmal.h>
|
||||
|
||||
/** \ingroup py_c
|
||||
* \file python/rpmal-py.h
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "rpmdb-py.h"
|
||||
#include "rpmmi-py.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef H_RPMDB_PY
|
||||
#define H_RPMDB_PY
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
|
||||
/** \ingroup py_c
|
||||
* \file python/rpmdb-py.h
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmstring.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmstring.h>
|
||||
|
||||
#include "header-py.h"
|
||||
#include "rpmds-py.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef H_RPMDS_PY
|
||||
#define H_RPMDS_PY
|
||||
|
||||
#include <rpmds.h>
|
||||
#include <rpm/rpmds.h>
|
||||
|
||||
/** \ingroup py_c
|
||||
* \file python/rpmds-py.h
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmio.h> /* XXX fdGetFILE */
|
||||
#include <rpm/rpmio.h> /* XXX fdGetFILE */
|
||||
|
||||
#include "header-py.h" /* XXX pyrpmError */
|
||||
#include "rpmfd-py.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "header-py.h"
|
||||
#include "rpmfi-py.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef H_RPMFI_PY
|
||||
#define H_RPMFI_PY
|
||||
|
||||
#include <rpmfi.h>
|
||||
#include <rpm/rpmfi.h>
|
||||
|
||||
/** \ingroup py_c
|
||||
* \file python/rpmfi-py.h
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
#include "structmember.h"
|
||||
|
||||
#include "rpmmacro-py.h"
|
||||
#include <rpmmacro.h>
|
||||
#include <rpm/rpmmacro.h>
|
||||
|
||||
#include "debug.h"
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpmdb.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
|
||||
#include "rpmmi-py.h"
|
||||
#include "header-py.h"
|
||||
|
|
|
@ -4,9 +4,9 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmdb.h>
|
||||
#include <rpmsq.h>
|
||||
#include <rpmlog.h>
|
||||
#include <rpm/rpmdb.h>
|
||||
#include <rpm/rpmsq.h>
|
||||
#include <rpm/rpmlog.h>
|
||||
|
||||
#include "header-py.h"
|
||||
#include "rpmal-py.h"
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "system.h"
|
||||
|
||||
#include <rpmlib.h>
|
||||
#include <rpm/rpmlib.h>
|
||||
|
||||
#include "rpmps-py.h"
|
||||
|
||||
|
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue