Make rpmtag.h standalone, include from rpmtypes.h

- permits header.h to use the tag types
- revert other includes back to header.h, more crazy #include churn...
- rpmTagTable etc in header.h for now, don't really belong there but...

3 files changed, 22 insertions, 14 deletions

diff --git a/rpmdb/hdrNVR.c b/rpmdb/hdrNVR.c
index 17790cb81..04480a08d 100644
--- a/rpmdb/hdrNVR.c
+++ b/rpmdb/hdrNVR.c
@@ -5,7 +5,7 @@
 #include "system.h"
 
 #include <rpm/rpmtypes.h>
-#include <rpm/rpmtag.h>
+#include <rpm/header.h>
 
 #include "debug.h"
 
diff --git a/rpmdb/header.h b/rpmdb/header.h
index eec2468dc..04cae17f7 100644
--- a/rpmdb/header.h
+++ b/rpmdb/header.h
@@ -162,6 +162,26 @@ struct headerSprintfExtension_s {
  */
 extern const struct headerSprintfExtension_s headerDefaultFormats[];
 
+/** \ingroup rpmtag
+ * Automatically generated table of tag name/value pairs.
+ */
+extern const struct headerTagTableEntry_s * rpmTagTable;
+
+/** \ingroup rpmtag
+ * Number of entries in rpmTagTable.
+ */
+extern const int rpmTagTableSize;
+
+/** \ingroup rpmtag
+ */
+extern headerTagIndices rpmTags;
+
+/** \ingroup header
+ * Table of query format extensions.
+ * @note Chains to headerDefaultFormats[].
+ */
+extern const struct headerSprintfExtension_s rpmHeaderFormats[];
+
 /** \ingroup header
  * Include calculation for 8 bytes of (magic, 0)?
  */
@@ -170,18 +190,6 @@ enum hMagic {
     HEADER_MAGIC_YES		= 1
 };
 
-/**
- * Header private tags.
- * @note General use tags should start at 1000 (RPM's tag space starts there).
- */
-#define	HEADER_IMAGE		61
-#define	HEADER_SIGNATURES	62
-#define	HEADER_IMMUTABLE	63
-#define	HEADER_REGIONS		64
-#define HEADER_I18NTABLE	100
-#define	HEADER_SIGBASE		256
-#define	HEADER_TAGBASE		1000
-
 /* Return types for header data. Not yet... */
 #if 0
 /**
diff --git a/rpmdb/tagname.c b/rpmdb/tagname.c
index 6b6476fe2..242c5ff8b 100644
--- a/rpmdb/tagname.c
+++ b/rpmdb/tagname.c
@@ -4,7 +4,7 @@
 
 #include "system.h"
 
-#include <rpm/rpmtag.h>
+#include <rpm/header.h>
 #include <rpm/rpmstring.h>
 #include "debug.h"