From 710750ebff4ded200a71107b6dba8f5daf573101 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 2 Jul 2008 14:23:30 +0300
Subject: [PATCH] Make rpmkeyring.h public header

---
 Makefile.am          | 1 +
 lib/rpmts.c          | 3 ++-
 lib/rpmts_internal.h | 1 -
 preinstall.am        | 4 ++++
 rpmio/Makefile.am    | 2 +-
 rpmio/rpmkeyring.c   | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 0cba0c4..36268f2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,6 +53,7 @@ pkginclude_HEADERS += rpmio/rpmstring.h
 pkginclude_HEADERS += rpmio/rpmsw.h
 pkginclude_HEADERS += rpmio/rpmfileutil.h
 pkginclude_HEADERS += rpmio/rpmutil.h
+pkginclude_HEADERS += rpmio/rpmkeyring.h
 
 pkginclude_HEADERS += lib/header.h
 pkginclude_HEADERS += lib/rpmdb.h
diff --git a/lib/rpmts.c b/lib/rpmts.c
index 546ebc0..713767c 100644
--- a/lib/rpmts.c
+++ b/lib/rpmts.c
@@ -9,10 +9,10 @@
 #include <rpm/rpmtypes.h>
 #include <rpm/rpmlib.h>			/* rpmReadPackage etc */
 #include <rpm/rpmurl.h>
-#include "rpmio/digest.h"
 #include <rpm/rpmmacro.h>
 #include <rpm/rpmfileutil.h>		/* rpmtsOpenDB() needs rpmGetPath */
 #include <rpm/rpmstring.h>
+#include <rpm/rpmkeyring.h>
 
 #include <rpm/rpmdb.h>
 #include <rpm/rpmal.h>
@@ -21,6 +21,7 @@
 #include <rpm/rpmlog.h>
 #include <rpm/rpmte.h>
 
+#include "rpmio/digest.h"
 #include "lib/rpmlock.h"
 #include "lib/rpmts_internal.h"
 
diff --git a/lib/rpmts_internal.h b/lib/rpmts_internal.h
index b1d2d79..9693a18 100644
--- a/lib/rpmts_internal.h
+++ b/lib/rpmts_internal.h
@@ -4,7 +4,6 @@
 #include <rpm/rpmts.h>
 #include <rpm/rpmal.h>	/* XXX availablePackage/relocateFileList ,*/
 
-#include "rpmio/rpmkeyring.h"
 #include "lib/rpmhash.h"	/* XXX hashTable */
 
 /** \ingroup rpmts
diff --git a/preinstall.am b/preinstall.am
index d679585..ca914e6 100644
--- a/preinstall.am
+++ b/preinstall.am
@@ -46,6 +46,10 @@ include/rpm/rpmutil.h: rpmio/rpmutil.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmutil.h include/rpm/rpmutil.h
 BUILT_SOURCES += include/rpm/rpmutil.h
 CLEANFILES += include/rpm/rpmutil.h
+include/rpm/rpmkeyring.h: rpmio/rpmkeyring.h include/rpm/$(dirstamp)
+	$(INSTALL_DATA) $(top_srcdir)/rpmio/rpmkeyring.h include/rpm/rpmkeyring.h
+BUILT_SOURCES += include/rpm/rpmkeyring.h
+CLEANFILES += include/rpm/rpmkeyring.h
 include/rpm/header.h: lib/header.h include/rpm/$(dirstamp)
 	$(INSTALL_DATA) $(top_srcdir)/lib/header.h include/rpm/header.h
 BUILT_SOURCES += include/rpm/header.h
diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 4148e31..2e9ccd3 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -17,7 +17,7 @@ librpmio_la_SOURCES = \
 	rpmpgp.c rpmsq.c rpmsw.c url.c ugid.c \
 	rpmio_internal.h rpmlua.h rpmhook.h ugid.h fts.h \
 	rpmstring.c rpmfileutil.c \
-	rpmkeyring.h rpmkeyring.c
+	rpmkeyring.c
 
 librpmio_la_LDFLAGS = -release 4.6
 librpmio_la_LIBADD = \
diff --git a/rpmio/rpmkeyring.c b/rpmio/rpmkeyring.c
index 99ac149..b37a9eb 100644
--- a/rpmio/rpmkeyring.c
+++ b/rpmio/rpmkeyring.c
@@ -4,8 +4,8 @@
 #include <rpm/rpmpgp.h>
 #include <rpm/rpmfileutil.h>
 #include <rpm/rpmlog.h>
+#include <rpm/rpmkeyring.h>
 
-#include "rpmio/rpmkeyring.h"
 #include "rpmio/base64.h"
 #include "rpmio/digest.h"
 
-- 
2.7.4