Stuff signature tags to rpmtag.h along with other tags, add enum typedef

diff --git a/lib/rpmlib.h b/lib/rpmlib.h
index 45aee0c..24861f6 100644 (file)
--- a/lib/rpmlib.h
+++ b/lib/rpmlib.h
@@ -265,25 +265,6 @@ int rpmGetFilesystemUsage(const char ** fileList, int32_t * fssizes,
 /** \name RPMK */
 
 /** \ingroup signature
- * Tags found in signature header from package.
- */
-enum rpmtagSignature {
-    RPMSIGTAG_SIZE     = 1000, /*!< internal Header+Payload size in bytes. */
-    RPMSIGTAG_LEMD5_1  = 1001, /*!< internal Broken MD5, take 1 @deprecated legacy. */
-    RPMSIGTAG_PGP      = 1002, /*!< internal PGP 2.6.3 signature. */
-    RPMSIGTAG_LEMD5_2  = 1003, /*!< internal Broken MD5, take 2 @deprecated legacy. */
-    RPMSIGTAG_MD5      = 1004, /*!< internal MD5 signature. */
-    RPMSIGTAG_GPG      = 1005, /*!< internal GnuPG signature. */
-    RPMSIGTAG_PGP5     = 1006, /*!< internal PGP5 signature @deprecated legacy. */
-    RPMSIGTAG_PAYLOADSIZE = 1007,/*!< internal uncompressed payload size in bytes. */
-    RPMSIGTAG_BADSHA1_1        = RPMTAG_BADSHA1_1,     /*!< internal Broken SHA1, take 1. */
-    RPMSIGTAG_BADSHA1_2        = RPMTAG_BADSHA1_2,     /*!< internal Broken SHA1, take 2. */
-    RPMSIGTAG_SHA1     = RPMTAG_SHA1HEADER,    /*!< internal sha1 header digest. */
-    RPMSIGTAG_DSA      = RPMTAG_DSAHEADER,     /*!< internal DSA header signature. */
-    RPMSIGTAG_RSA      = RPMTAG_RSAHEADER      /*!< internal RSA header signature. */
-};
-
-/** \ingroup signature
  * Verify a signature from a package.
  *
  * This needs the following variables from the transaction set:

diff --git a/lib/rpmtag.h b/lib/rpmtag.h
index 2f0d93e..e726741 100644 (file)
--- a/lib/rpmtag.h
+++ b/lib/rpmtag.h
@@ -283,6 +283,25 @@ typedef enum rpmTag_e {
 #define        RPMTAG_EXTERNAL_TAG             1000000
 #define RPMTAG_NOT_FOUND               -1
 
+/** \ingroup signature
+ * Tags found in signature header from package.
+ */
+typedef enum rpmSigTag_e {
+    RPMSIGTAG_SIZE     = 1000, /*!< internal Header+Payload size in bytes. */
+    RPMSIGTAG_LEMD5_1  = 1001, /*!< internal Broken MD5, take 1 @deprecated legacy. */
+    RPMSIGTAG_PGP      = 1002, /*!< internal PGP 2.6.3 signature. */
+    RPMSIGTAG_LEMD5_2  = 1003, /*!< internal Broken MD5, take 2 @deprecated legacy. */
+    RPMSIGTAG_MD5      = 1004, /*!< internal MD5 signature. */
+    RPMSIGTAG_GPG      = 1005, /*!< internal GnuPG signature. */
+    RPMSIGTAG_PGP5     = 1006, /*!< internal PGP5 signature @deprecated legacy. */
+    RPMSIGTAG_PAYLOADSIZE = 1007,/*!< internal uncompressed payload size in bytes. */
+    RPMSIGTAG_BADSHA1_1        = RPMTAG_BADSHA1_1,     /*!< internal Broken SHA1, take 1. */
+    RPMSIGTAG_BADSHA1_2        = RPMTAG_BADSHA1_2,     /*!< internal Broken SHA1, take 2. */
+    RPMSIGTAG_SHA1     = RPMTAG_SHA1HEADER,    /*!< internal sha1 header digest. */
+    RPMSIGTAG_DSA      = RPMTAG_DSAHEADER,     /*!< internal DSA header signature. */
+    RPMSIGTAG_RSA      = RPMTAG_RSAHEADER      /*!< internal RSA header signature. */
+} rpmSigTag;
+
 
 /** \ingroup header
  * The basic types of data in tags from headers.