Switch to <rpm/foo.h> style for public headers

- adjust include paths accordingly

24 files changed, 69 insertions, 69 deletions

diff --git a/build/Makefile.am b/build/Makefile.am
index 35d8834cb..ff6195a86 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -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@
diff --git a/build/build.c b/build/build.c
index 7f8d18ef9..177cbd223 100644
--- a/build/build.c
+++ b/build/build.c
@@ -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"
 
diff --git a/build/buildio.h b/build/buildio.h
index 28252bb6d..4750035cd 100644
--- a/build/buildio.h
+++ b/build/buildio.h
@@ -8,7 +8,7 @@
  * @todo Eliminate, merge into rpmlib.
  */
 
-#include <rpmbuild.h>
+#include <rpm/rpmbuild.h>
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/build/expression.c b/build/expression.c
index a3c799ee8..18a42351b 100644
--- a/build/expression.c
+++ b/build/expression.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"
 
diff --git a/build/files.c b/build/files.c
index 429fcefe4..dca32e69f 100644
--- a/build/files.c
+++ b/build/files.c
@@ -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)++; }
diff --git a/build/misc.c b/build/misc.c
index c084dcf40..20973662b 100644
--- a/build/misc.c
+++ b/build/misc.c
@@ -3,7 +3,7 @@
  */
 #include "system.h"
 
-#include <rpmbuild.h>
+#include <rpm/rpmbuild.h>
 #include "debug.h"
 
 int parseNum(const char * line, int * res)
diff --git a/build/names.c b/build/names.c
index 2eb8f2596..14fdad41f 100644
--- a/build/names.c
+++ b/build/names.c
@@ -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;
diff --git a/build/pack.c b/build/pack.c
index 4d121ec90..5a616baba 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -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"
 
 /**
diff --git a/build/parseBuildInstallClean.c b/build/parseBuildInstallClean.c
index f16127be6..e29b38e3f 100644
--- a/build/parseBuildInstallClean.c
+++ b/build/parseBuildInstallClean.c
@@ -4,8 +4,8 @@
  */
 #include "system.h"
 
-#include <rpmbuild.h>
-#include <rpmlog.h>
+#include <rpm/rpmbuild.h>
+#include <rpm/rpmlog.h>
 #include "debug.h"
 
 
diff --git a/build/parseChangelog.c b/build/parseChangelog.c
index a39a74f49..e62745370 100644
--- a/build/parseChangelog.c
+++ b/build/parseChangelog.c
@@ -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)++; }
diff --git a/build/parseDescription.c b/build/parseDescription.c
index b1190287f..25423aade 100644
--- a/build/parseDescription.c
+++ b/build/parseDescription.c
@@ -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;
diff --git a/build/parseFiles.c b/build/parseFiles.c
index 2b3e1a3ea..e685b4413 100644
--- a/build/parseFiles.c
+++ b/build/parseFiles.c
@@ -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 */
diff --git a/build/parsePreamble.c b/build/parsePreamble.c
index b8982d223..bce36b032 100644
--- a/build/parsePreamble.c
+++ b/build/parsePreamble.c
@@ -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)++; }
diff --git a/build/parsePrep.c b/build/parsePrep.c
index 35cd95471..f20f8666f 100644
--- a/build/parsePrep.c
+++ b/build/parsePrep.c
@@ -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 */
diff --git a/build/parseReqs.c b/build/parseReqs.c
index 4e0dc6cfb..a4bc213b8 100644
--- a/build/parseReqs.c
+++ b/build/parseReqs.c
@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmbuild.h>
-#include <rpmlog.h>
+#include <rpm/rpmbuild.h>
+#include <rpm/rpmlog.h>
 #include "debug.h"
 
 /**
diff --git a/build/parseScript.c b/build/parseScript.c
index 9c613e333..54d85f559 100644
--- a/build/parseScript.c
+++ b/build/parseScript.c
@@ -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"
diff --git a/build/parseSpec.c b/build/parseSpec.c
index 4d4be4400..d4edab859 100644
--- a/build/parseSpec.c
+++ b/build/parseSpec.c
@@ -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)++; }
diff --git a/build/poptBT.c b/build/poptBT.c
index 99ff7c871..7ce5a9c4f 100644
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -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;
diff --git a/build/reqprov.c b/build/reqprov.c
index f0ffe27a9..1b02aeefb 100644
--- a/build/reqprov.c
+++ b/build/reqprov.c
@@ -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,
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 6b8e222e2..2754a3769 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -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" {
diff --git a/build/rpmfc.c b/build/rpmfc.c
index 73137749a..5eb1b2110 100644
--- a/build/rpmfc.c
+++ b/build/rpmfc.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>
diff --git a/build/rpmfc.h b/build/rpmfc.h
index 87034941d..7d6dd9f09 100644
--- a/build/rpmfc.h
+++ b/build/rpmfc.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" {
diff --git a/build/rpmspec.h b/build/rpmspec.h
index 4409ea36d..dc511485d 100644
--- a/build/rpmspec.h
+++ b/build/rpmspec.h
@@ -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" {
diff --git a/build/spec.c b/build/spec.c
index d9e4bea35..ddffb48f6 100644
--- a/build/spec.c
+++ b/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"