sync with rpm4 branch: include local headers

build.c

@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
-#include <rpmbuild.h>
+#include "rpmcli.h"
+#include "rpmbuild.h"
 
 #include "build.h"
 #include "debug.h"

build/build.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 
 #include "debug.h"
 

build/expression.c

@@ -13,8 +13,8 @@
 
 #include "system.h"
 
-#include <rpmbuild.h>
-#include <rpmlib.h>
+#include "rpmbuild.h"
+#include "rpmlib.h"
 
 #include "debug.h"
 

build/files.c

@@ -11,8 +11,8 @@
 #include <regex.h>
 #include <signal.h>	/* getOutputFrom() */
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 
 #include "buildio.h"
 

build/myftw.c

@@ -24,7 +24,7 @@ Cambridge, MA 02139, USA.  */
 
 #include "system.h"
 
-#include <rpmio.h>
+#include "rpmio.h"
 
 #ifndef NAMLEN
 #define NAMLEN(a) strlen((a)->d_name)

build/pack.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 #include "buildio.h"
 
 #include "misc.h"

build/parsePreamble.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 #include "debug.h"
 
 /*@access FD_t @*/	/* compared with NULL */

build/parsePrep.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 #include "debug.h"
 
 /*@access StringBuf @*/	/* compared with NULL */

build/parseSpec.c

@@ -8,8 +8,8 @@
 /*@unchecked@*/
 static int _debug = 0;
 
-#include <rpmio_internal.h>
-#include <rpmbuild.h>
+#include "rpmio_internal.h"
+#include "rpmbuild.h"
 #include "debug.h"
 
 /*@access FD_t @*/	/* compared with NULL */

build/poptBT.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
-#include <rpmbuild.h>
+#include "rpmcli.h"
+#include "rpmbuild.h"
 
 #include "build.h"
 #include "debug.h"

lib/depends.c

@@ -8,8 +8,8 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmmacro.h>		/* XXX for rpmExpand() */
+#include "rpmlib.h"
+#include "rpmmacro.h"		/* XXX for rpmExpand() */
 
 #include "depends.h"
 #include "rpmdb.h"		/* XXX response cache needs dbiOpen et al. */

lib/formats.c

@@ -3,8 +3,8 @@
  */
 
 #include "system.h"
-#include <rpmlib.h>
-#include <rpmmacro.h>	/* XXX for %_i18ndomains */
+#include "rpmlib.h"
+#include "rpmmacro.h"	/* XXX for %_i18ndomains */
 #include "rpmpgp.h"
 #include "manifest.h"
 #include "misc.h"

lib/fs.c

@@ -4,8 +4,8 @@
  */
 
 #include "system.h"
-#include <rpmlib.h>
-#include <rpmmacro.h>	/* XXX for rpmGetPath */
+#include "rpmlib.h"
+#include "rpmmacro.h"	/* XXX for rpmGetPath */
 #include "debug.h"
 
 /*@-usereleased -onlytrans@*/

lib/manifest.c

@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmio_internal.h>
-#include <rpmlib.h>
+#include "rpmio_internal.h"
+#include "rpmlib.h"
 
 #include "stringbuf.h"
 #include "manifest.h"

lib/misc.c

@@ -10,9 +10,9 @@ static int _debug = 0;
 const char * RPMVERSION = VERSION;
 
 #include "rpmio_internal.h"
-#include <rpmlib.h>
-#include <rpmurl.h>
-#include <rpmmacro.h>	/* XXX for rpmGetPath */
+#include "rpmlib.h"
+#include "rpmurl.h"
+#include "rpmmacro.h"	/* XXX for rpmGetPath */
 
 #include "misc.h"
 #include "debug.h"

lib/package.c

@@ -6,7 +6,7 @@
 
 #include <netinet/in.h>
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 
 #include "misc.h"
 #include "rpmlead.h"

lib/poptI.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "debug.h"
 

lib/poptK.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "debug.h"
 

lib/poptQV.c

@@ -5,8 +5,8 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
-#include <rpmbuild.h>
+#include "rpmcli.h"
+#include "rpmbuild.h"
 
 #include "debug.h"
 

lib/problems.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 
 #include "depends.h"
 #include "misc.h"

lib/psm.c

@@ -6,8 +6,8 @@
 #include "system.h"
 
 #include "psm.h"
-#include <rpmmacro.h>
-#include <rpmurl.h>
+#include "rpmmacro.h"
+#include "rpmurl.h"
 
 #include "depends.h"
 

lib/query.c

@@ -11,8 +11,8 @@
 /*@=incondefs@*/
 #endif
 
-#include <rpmcli.h>
-#include <rpmbuild.h>
+#include "rpmcli.h"
+#include "rpmbuild.h"
 #include "manifest.h"
 #include "debug.h"
 

lib/rpmchecksig.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "rpmlead.h"
 #include "signature.h"

lib/rpminstall.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "manifest.h"
 #include "misc.h"	/* XXX for rpmGlob() */

lib/rpmlead.c

@@ -10,7 +10,7 @@
 
 #include <netinet/in.h>
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 
 #include "rpmlead.h"
 #include "debug.h"

lib/rpmlibprov.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 #include "debug.h"
 
 static struct rpmlibProvides_s {

lib/rpmrc.c

@@ -13,8 +13,8 @@
 #define __power_pc() 0
 #endif
 
-#include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmlib.h"
+#include "rpmmacro.h"
 
 #include "misc.h"
 #include "debug.h"

lib/rpmvercmp.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 
 #include "debug.h"
 

lib/signature.c

@@ -14,8 +14,8 @@
 #include "system.h"
 
 #include "rpmio_internal.h"
-#include <rpmlib.h>
-#include <rpmmacro.h>	/* XXX for rpmGetPath() */
+#include "rpmlib.h"
+#include "rpmmacro.h"	/* XXX for rpmGetPath() */
 
 #include "md5.h"
 #include "misc.h"	/* XXX for dosetenv() and makeTempFile() */

lib/tagName.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 #include "debug.h"
 
 const char *const tagName(int tag)

lib/transaction.c

@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpmmacro.h>	/* XXX for rpmExpand */
+#include "rpmmacro.h"	/* XXX for rpmExpand */
 
 #include "psm.h"
 

lib/verify.c

@@ -6,7 +6,7 @@
 #include "system.h"
 
 #include "psm.h"
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "ugid.h"
 #include "misc.h"	/* XXX for uidToUname() and gnameToGid() */

python/upgrade.c

@@ -11,7 +11,7 @@
 #include <glob.h>	/* XXX rpmio.h */
 #include <dirent.h>	/* XXX rpmio.h */
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 
 #include "hash.h"
 #include "upgrade.h"

rpmdb/db1.c

@@ -9,10 +9,10 @@
 
 #define	_mymemset(_a, _b, _c)
 
-#include <rpmio_internal.h>
-#include <rpmlib.h>
-#include <rpmmacro.h>	/* XXX rpmGenPath */
-#include <rpmurl.h>	/* XXX urlGetPath */
+#include "rpmio_internal.h"
+#include "rpmlib.h"
+#include "rpmmacro.h"	/* XXX rpmGenPath */
+#include "rpmurl.h"	/* XXX urlGetPath */
 
 #include "falloc.h"
 #include "misc.h"

rpmdb/db3.c

@@ -25,9 +25,9 @@ typedef	int int32_t;
 
 #include <db3/db.h>
 
-#include <rpmlib.h>
-#include <rpmmacro.h>
-#include <rpmurl.h>	/* XXX urlPath proto */
+#include "rpmlib.h"
+#include "rpmmacro.h"
+#include "rpmurl.h"	/* XXX urlPath proto */
 
 #include "rpmdb.h"
 

rpmdb/dbconfig.c

@@ -17,8 +17,8 @@ typedef	int int32_t;
 
 #include <db3/db.h>
 
-#include <rpmlib.h>
-#include <rpmmacro.h>
+#include "rpmlib.h"
+#include "rpmmacro.h"
 
 #include "rpmdb.h"
 #include "debug.h"

rpmdb/falloc.c

@@ -12,9 +12,9 @@
  */
 
 #include "system.h"
-#include <rpmio_internal.h>
-#include <rpmmessages.h>
-#include <rpmerr.h>
+#include "rpmio_internal.h"
+#include "rpmmessages.h"
+#include "rpmerr.h"
 #include "falloc.h"
 #include "debug.h"
 

rpmdb/fprint.c

@@ -4,8 +4,8 @@
 
 #include "system.h"
 
-#include <rpmdb.h>
-#include <rpmmacro.h>	/* XXX for rpmCleanPath */
+#include "rpmdb.h"
+#include "rpmmacro.h"	/* XXX for rpmCleanPath */
 
 #include "fprint.h"
 #include "debug.h"

rpmdb/poptDB.c

@@ -5,7 +5,7 @@
 
 #include "system.h"
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "debug.h"
 

rpmdb/rpmdb.c

@@ -29,7 +29,7 @@ extern void regfree (/*@only@*/ regex_t *preg)
 /*@=declundef =exportheader @*/
 #endif
 
-#include <rpmcli.h>
+#include "rpmcli.h"
 
 #include "rpmdb.h"
 #include "fprint.h"

rpmdb/rpmhash.c

@@ -4,7 +4,7 @@
  */
 
 #include "system.h"
-#include <rpmlib.h>
+#include "rpmlib.h"
 #include "rpmhash.h"
 #include "debug.h"
 

rpmio/macro.c

@@ -42,13 +42,13 @@ typedef	FILE * FD_t;
 
 #else
 
-#include <rpmio_internal.h>
-#include <rpmmessages.h>
-#include <rpmerr.h>
+#include "rpmio_internal.h"
+#include "rpmmessages.h"
+#include "rpmerr.h"
 
 #endif
 
-#include <rpmmacro.h>
+#include "rpmmacro.h"
 
 #include "debug.h"
 

rpmio/rpmio.c

@@ -64,7 +64,7 @@ static int inet_aton(const char *cp, struct in_addr *inp)
 #include "dns.h"
 #endif
 
-#include <rpmio_internal.h>
+#include "rpmio_internal.h"
 #undef	fdFileno
 #undef	fdOpen
 #undef	fdRead

rpmio/rpmrpc.c

@@ -4,7 +4,7 @@
  */
 
 #include "system.h"
-#include <rpmio_internal.h>
+#include "rpmio_internal.h"
 #include <popt.h>
 #include "ugid.h"
 #include "debug.h"

rpmio/url.c

@@ -7,9 +7,9 @@
 
 #include <netinet/in.h>
 
-#include <rpmmacro.h>
-#include <rpmmessages.h>
-#include <rpmio_internal.h>
+#include "rpmmacro.h"
+#include "rpmmessages.h"
+#include "rpmio_internal.h"
 
 #include "debug.h"
 

rpmqv.c

@@ -10,8 +10,8 @@
 #define	IAM_RPMK
 #endif
 
-#include <rpmcli.h>
-#include <rpmbuild.h>
+#include "rpmcli.h"
+#include "rpmbuild.h"
 
 #define	POPT_NODEPS		1025
 #define	POPT_FORCE		1026

tools/dump.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 #include "header_internal.h"
 #include "debug.h"
 

tools/dumpdb.c

@@ -1,6 +1,6 @@
 #include "system.h"
 
-#include <rpmlib.h>
+#include "rpmlib.h"
 #include "header_internal.h"
 #include "debug.h"
 

tools/rpmsort.c

@@ -1,8 +1,8 @@
 #include "system.h"
 
-#include <rpmlib.h>
-#include <rpmmacro.h>
-#include <rpmurl.h>
+#include "rpmlib.h"
+#include "rpmmacro.h"
+#include "rpmurl.h"
 
 #include "depends.h"