Remove the deprecated rpmlead definitions from public headers

diff --git a/lib/rpmlead.h b/lib/rpmlead.h
index 72d96d4..f42922a 100644 (file)
--- a/lib/rpmlead.h
+++ b/lib/rpmlead.h
@@ -9,6 +9,36 @@
 extern "C" {
 #endif
 
+#define RPMLEAD_BINARY 0
+#define RPMLEAD_SOURCE 1
+
+#define RPMLEAD_MAGIC0 0xed
+#define RPMLEAD_MAGIC1 0xab
+#define RPMLEAD_MAGIC2 0xee
+#define RPMLEAD_MAGIC3 0xdb
+
+#define RPMLEAD_SIZE 96         /*!< Don't rely on sizeof(struct) */
+
+/** \ingroup lead
+ * The lead data structure.
+ * The lead needs to be 8 byte aligned.
+ * @deprecated The lead (except for signature_type) is legacy.
+ * @todo Don't use any information from lead.
+ */
+struct rpmlead {
+    unsigned char magic[4];
+    unsigned char major;
+    unsigned char minor;
+    short type;
+    short archnum;
+    char name[66];
+    short osnum;
+    short signature_type;      /*!< Signature header type (RPMSIG_HEADERSIG) */
+char reserved[16];     /*!< Pad to 96 bytes -- 8 byte aligned! */
+} ;
+
+#include "rpmlib.h"
+
 /** \ingroup lead
  * Write lead to file handle.
  * @param fd           file handle

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 450efa6..7cd9bee 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -952,34 +952,6 @@ int rpmTagGetType(int tag);
  */
 int rpmTagGetValue(const char * tagstr);
 
-#define        RPMLEAD_BINARY 0
-#define        RPMLEAD_SOURCE 1
-
-#define        RPMLEAD_MAGIC0 0xed
-#define        RPMLEAD_MAGIC1 0xab
-#define        RPMLEAD_MAGIC2 0xee
-#define        RPMLEAD_MAGIC3 0xdb
-
-#define        RPMLEAD_SIZE 96         /*!< Don't rely on sizeof(struct) */
-
-/** \ingroup lead
- * The lead data structure.
- * The lead needs to be 8 byte aligned.
- * @deprecated The lead (except for signature_type) is legacy.
- * @todo Don't use any information from lead.
- */
-struct rpmlead {
-    unsigned char magic[4];
-    unsigned char major;
-    unsigned char minor;
-    short type;
-    short archnum;
-    char name[66];
-    short osnum;
-    short signature_type;      /*!< Signature header type (RPMSIG_HEADERSIG) */
-char reserved[16];     /*!< Pad to 96 bytes -- 8 byte aligned! */
-} ;
-
 /**
  * Release storage used by file system usage cache.
  */

diff --git a/rpmdb/legacy.c b/rpmdb/legacy.c
index 5959ecd..2213e46 100644 (file)
--- a/rpmdb/legacy.c
+++ b/rpmdb/legacy.c
@@ -18,6 +18,7 @@
 #endif
 
 #include "rpmio_internal.h"
+#include "rpmlead.h"
 #include <rpmlib.h>
 #include <rpmmacro.h>
 #include "misc.h"

diff --git a/rpmdb/legacy.h b/rpmdb/legacy.h
index 69b54d6..e6da645 100644 (file)
--- a/rpmdb/legacy.h
+++ b/rpmdb/legacy.h
@@ -6,6 +6,8 @@
  *
  */
 
+#include "rpmlead.h"
+
 /**
  */
 extern int _noDirTokens;