From 547acb66961e912a4be05bdbd32ab7f3aeac7357 Mon Sep 17 00:00:00 2001
From: Panu Matilainen <pmatilai@redhat.com>
Date: Wed, 13 Apr 2022 09:59:45 +0300
Subject: [PATCH] Rename the internal rpmpgp.h header to rpmpgpval.h for
 clarity

Commit d8bb57eeabe249c2c85bf46b1162d7e57a310e37 reintroduced
rpmio/rpmpgp.h which is quite confusing when we have a public header by
the same name elsewhere, and doubly more confusing to those of use who
are used to having the public header by the same name in this very
location prior to commit 650ba79f2253656f9ec8e06f399fafe40e556ed3.

No functional changes.
---
 rpmio/Makefile.am               | 2 +-
 rpmio/rpmpgp.c                  | 2 +-
 rpmio/rpmpgp_internal.c         | 2 +-
 rpmio/{rpmpgp.h => rpmpgpval.h} | 0
 4 files changed, 3 insertions(+), 3 deletions(-)
 rename rpmio/{rpmpgp.h => rpmpgpval.h} (100%)

diff --git a/rpmio/Makefile.am b/rpmio/Makefile.am
index 35718cbf80..d91dd12616 100644
--- a/rpmio/Makefile.am
+++ b/rpmio/Makefile.am
@@ -20,7 +20,7 @@ usrlib_LTLIBRARIES = librpmio.la
 librpmio_la_SOURCES = \
 	argv.c base64.c digest.h digest.c expression.c macro.c \
 	rpmhook.c rpmio.c rpmlog.c rpmmalloc.c rgetopt.c \
-	rpmpgp.c rpmpgp.h rpmsq.c rpmsw.c url.c \
+	rpmpgp.c rpmpgpval.h rpmsq.c rpmsw.c url.c \
 	rpmio_internal.h rpmhook.h rpmvercmp.c rpmver.c \
 	rpmstring.c rpmfileutil.c rpmglob.c \
 	rpmkeyring.c rpmstrpool.c rpmmacro_internal.h \
diff --git a/rpmio/rpmpgp.c b/rpmio/rpmpgp.c
index efff7ff062..15eff36e98 100644
--- a/rpmio/rpmpgp.c
+++ b/rpmio/rpmpgp.c
@@ -11,7 +11,7 @@
 #include <rpm/rpmlog.h>
 
 #include "rpmio/digest.h"
-#include "rpmio/rpmpgp.h"
+#include "rpmio/rpmpgpval.h"
 #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include "debug.h"
diff --git a/rpmio/rpmpgp_internal.c b/rpmio/rpmpgp_internal.c
index 9c69f12838..1be705ebe8 100644
--- a/rpmio/rpmpgp_internal.c
+++ b/rpmio/rpmpgp_internal.c
@@ -12,7 +12,7 @@
 #include <rpm/rpmbase64.h>
 
 #include "rpmio/digest.h"
-#include "rpmio/rpmpgp.h"
+#include "rpmio/rpmpgpval.h"
 #include "rpmio/rpmio_internal.h"	/* XXX rpmioSlurp */
 
 #include "debug.h"
diff --git a/rpmio/rpmpgp.h b/rpmio/rpmpgpval.h
similarity index 100%
rename from rpmio/rpmpgp.h
rename to rpmio/rpmpgpval.h