From 7628c31bb9688c04561bd46c840ec9437fab4f67 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Tue, 23 Mar 2010 16:29:59 +0200
Subject: [PATCH] Fix fallout from rpmgi.h moving to internal path

---
 lib/poptALL.c    | 1 -
 lib/poptQV.c     | 2 +-
 lib/query.c      | 2 +-
 lib/rpmgi.c      | 2 +-
 lib/rpminstall.c | 2 +-
 preinstall.am    | 4 ----
 6 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/lib/poptALL.c b/lib/poptALL.c
index d569f36..2e0fc05 100644
--- a/lib/poptALL.c
+++ b/lib/poptALL.c
@@ -12,7 +12,6 @@ const char *__progname;
 
 #include <rpm/rpmcli.h>
 #include <rpm/rpmlib.h>		/* rpmEVR, rpmReadConfigFiles etc */
-#include <rpm/rpmgi.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmstring.h>
 #include <rpm/rpmfileutil.h>
diff --git a/lib/poptQV.c b/lib/poptQV.c
index 9fa3b13..07b31e1 100644
--- a/lib/poptQV.c
+++ b/lib/poptQV.c
@@ -6,7 +6,7 @@
 #include "system.h"
 
 #include <rpm/rpmcli.h>
-#include <rpm/rpmgi.h>	/* XXX for giFlags */
+#include "lib/rpmgi.h"	/* XXX for giFlags */
 
 #include "debug.h"
 
diff --git a/lib/query.c b/lib/query.c
index f448f23..d9b369a 100644
--- a/lib/query.c
+++ b/lib/query.c
@@ -13,11 +13,11 @@
 #include <rpm/header.h>
 #include <rpm/rpmdb.h>
 #include <rpm/rpmfi.h>
-#include <rpm/rpmgi.h>
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>	/* rpmCleanPath */
 
+#include "lib/rpmgi.h"
 #include "lib/manifest.h"
 
 #include "debug.h"
diff --git a/lib/rpmgi.c b/lib/rpmgi.c
index ed600e6..9b763ec 100644
--- a/lib/rpmgi.c
+++ b/lib/rpmgi.c
@@ -8,11 +8,11 @@
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>		/* rpmReadPackageFile */
 #include <rpm/rpmts.h>
-#include <rpm/rpmgi.h>
 #include <rpm/rpmmacro.h>		/* XXX rpmExpand */
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmlog.h>
 
+#include "lib/rpmgi.h"
 #include "lib/manifest.h"
 
 #include "debug.h"
diff --git a/lib/rpminstall.c b/lib/rpminstall.c
index b03dd35..8a54c99 100644
--- a/lib/rpminstall.c
+++ b/lib/rpminstall.c
@@ -12,8 +12,8 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmlog.h>
 #include <rpm/rpmfileutil.h>
-#include <rpm/rpmgi.h>
 
+#include "lib/rpmgi.h"
 #include "lib/manifest.h"
 #include "debug.h"
 
diff --git a/preinstall.am b/preinstall.am
index d79a9f0..eca2f28 100644
--- a/preinstall.am
+++ b/preinstall.am
@@ -74,10 +74,6 @@ include/rpm/rpmfi.h: lib/rpmfi.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/lib/rpmfi.h include/rpm/rpmfi.h
 BUILT_SOURCES += include/rpm/rpmfi.h
 CLEANFILES += include/rpm/rpmfi.h
-include/rpm/rpmgi.h: lib/rpmgi.h include/rpm/$(dirstamp)
-	$(INSTALL_DATA) $(top_srcdir)/lib/rpmgi.h include/rpm/rpmgi.h
-BUILT_SOURCES += include/rpm/rpmgi.h
-CLEANFILES += include/rpm/rpmgi.h
 include/rpm/rpmlegacy.h: lib/rpmlegacy.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/lib/rpmlegacy.h include/rpm/rpmlegacy.h
 BUILT_SOURCES += include/rpm/rpmlegacy.h
-- 
2.7.4