From 05dd62aba9c6bab44ba55ff1266ec9126b2f8874 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 1 Sep 2010 12:26:26 +0300
Subject: [PATCH] Lift remaining build-related stuff out of librpm over to
 build-side - none of this belongs to librpm headers and ABI

---
 build/poptBT.c   |  2 ++
 build/rpmbuild.h | 36 ++++++++++++++++++++++++++++++++++++
 lib/rpmcli.h     | 39 ---------------------------------------
 lib/rpmlead.c    |  2 --
 4 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/build/poptBT.c b/build/poptBT.c
index 72dda3c..5024ee9 100644
--- a/build/poptBT.c
+++ b/build/poptBT.c
@@ -45,6 +45,8 @@ int noLang = 0;
 
 static int noBuild = 0;
 
+int _noDirTokens = 0;
+
 /**
  */
 static void buildArgCallback( poptContext con,
diff --git a/build/rpmbuild.h b/build/rpmbuild.h
index 84491a3..0023e51 100644
--- a/build/rpmbuild.h
+++ b/build/rpmbuild.h
@@ -34,6 +34,42 @@ typedef enum rpmBuildFlags_e {
 } rpmBuildFlags;
 
 /** \ingroup rpmbuild
+ * Describe build command line request.
+ */
+struct rpmBuildArguments_s {
+    rpmQueryFlags qva_flags;	/*!< Bit(s) to control verification. */
+    int buildAmount;		/*!< Bit(s) to control operation. */
+    char * buildRootOverride; 	/*!< from --buildroot */
+    char * targets;		/*!< Target platform(s), comma separated. */
+    char * cookie;		/*!< NULL for binary, ??? for source, rpm's */
+    int force;			/*!< from --force */
+    int noBuild;		/*!< from --nobuild */
+    int noDeps;			/*!< from --nodeps */
+    int noLang;			/*!< from --nolang */
+    int shortCircuit;		/*!< from --short-circuit */
+    char buildMode;		/*!< Build mode (one of "btBC") */
+    char buildChar;		/*!< Build stage (one of "abcilps ") */
+    const char * rootdir;
+};
+
+/** \ingroup rpmbuild
+ */
+typedef	struct rpmBuildArguments_s *	BTA_t;
+
+/** \ingroup rpmbuild
+ */
+extern struct rpmBuildArguments_s	rpmBTArgs;
+
+/** \ingroup rpmbuild
+ */
+extern struct poptOption		rpmBuildPoptTable[];
+
+/** \ingroup rpmbuild
+ * Should version 3 packages be produced?
+ */
+extern int _noDirTokens;
+
+/** \ingroup rpmbuild
  * Parse spec file into spec control structure.
  * @param ts		transaction set (spec file control in ts->spec)
  * @param specFile
diff --git a/lib/rpmcli.h b/lib/rpmcli.h
index a2c3c87..3188776 100644
--- a/lib/rpmcli.h
+++ b/lib/rpmcli.h
@@ -21,11 +21,6 @@ extern "C" {
 #endif
 
 /** \ingroup rpmcli
- * Should version 3 packages be produced?
- */
-extern int _noDirTokens;
-
-/** \ingroup rpmcli
  * Popt option table for options shared by all modes and executables.
  */
 extern struct poptOption		rpmcliAllPoptTable[];
@@ -299,40 +294,6 @@ int rpmVerifySignatures(QVA_t qva, rpmts ts, FD_t fd, const char * fn);
 int rpmcliVerify(rpmts ts, QVA_t qva, ARGV_const_t argv);
 
 /* ==================================================================== */
-/** \name RPMBT */
-
-/** \ingroup rpmcli
- * Describe build command line request.
- */
-struct rpmBuildArguments_s {
-    rpmQueryFlags qva_flags;	/*!< Bit(s) to control verification. */
-    int buildAmount;		/*!< Bit(s) to control operation. */
-    char * buildRootOverride; 	/*!< from --buildroot */
-    char * targets;		/*!< Target platform(s), comma separated. */
-    char * cookie;		/*!< NULL for binary, ??? for source, rpm's */
-    int force;			/*!< from --force */
-    int noBuild;		/*!< from --nobuild */
-    int noDeps;			/*!< from --nodeps */
-    int noLang;			/*!< from --nolang */
-    int shortCircuit;		/*!< from --short-circuit */
-    char buildMode;		/*!< Build mode (one of "btBC") */
-    char buildChar;		/*!< Build stage (one of "abcilps ") */
-    const char * rootdir;
-};
-
-/** \ingroup rpmcli
- */
-typedef	struct rpmBuildArguments_s *	BTA_t;
-
-/** \ingroup rpmcli
- */
-extern struct rpmBuildArguments_s	rpmBTArgs;
-
-/** \ingroup rpmcli
- */
-extern struct poptOption		rpmBuildPoptTable[];
-
-/* ==================================================================== */
 /** \name RPMEIU */
 /* --- install/upgrade/erase modes */
 
diff --git a/lib/rpmlead.c b/lib/rpmlead.c
index c2fa4be..d41a413 100644
--- a/lib/rpmlead.c
+++ b/lib/rpmlead.c
@@ -16,8 +16,6 @@
 
 #include "debug.h"
 
-int _noDirTokens = 0;
-
 static unsigned char const lead_magic[] = {
     RPMLEAD_MAGIC0, RPMLEAD_MAGIC1, RPMLEAD_MAGIC2, RPMLEAD_MAGIC3
 };
-- 
2.7.4