rename rpmdb_pubkey to pubkey

8 files changed, 29 insertions, 27 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0fb4731..d34f68c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ OPTION (ENABLE_RUBY "Build the ruby bindings?" OFF)
 OPTION (USE_VENDORDIRS "Install the bindings in vendor directories?" OFF)
 
 OPTION (ENABLE_RPMDB "Build with rpm database support?" OFF)
-OPTION (ENABLE_RPMDB_PUBKEY "Build with rpmdb pubkey support?" OFF)
+OPTION (ENABLE_PUBKEY "Build with pubkey support?" OFF)
 OPTION (ENABLE_RPMDB_BYRPMHEADER "Build with rpmdb Header support?" OFF)
 OPTION (ENABLE_RPMMD "Build with rpmmd repository support?" OFF)
 OPTION (ENABLE_SUSEREPO "Build with suse repository support?" OFF)
@@ -83,7 +83,7 @@ IF (SUSE)
 MESSAGE (STATUS "Building for SUSE")
 ADD_DEFINITIONS (-DSUSE)
 SET (ENABLE_RPMDB ON)
-SET (ENABLE_RPMDB_PUBKEY ON)
+SET (ENABLE_PUBKEY ON)
 SET (ENABLE_RPMDB_BYRPMHEADER ON)
 SET (ENABLE_RPMMD ON)
 SET (ENABLE_SUSEREPO ON)
@@ -186,9 +186,9 @@ IF (ENABLE_RPMDB)
   CHECK_LIBRARY_EXISTS(rpmio pgpDigGetParams "" HAVE_PGPDIGGETPARAMS)
 ENDIF (ENABLE_RPMDB)
 
-IF (ENABLE_RPMDB_PUBKEY)
+IF (ENABLE_PUBKEY)
   SET (ENABLE_PGPVRFY ON)
-ENDIF (ENABLE_RPMDB_PUBKEY)
+ENDIF (ENABLE_PUBKEY)
 
 INCLUDE (CheckFunctionExists)
 INCLUDE (TestBigEndian)
@@ -201,7 +201,7 @@ TEST_BIG_ENDIAN (WORDS_BIGENDIAN)
 # should create config.h with #cmakedefine instead...
 FOREACH (VAR HAVE_STRCHRNUL HAVE_FOPENCOOKIE HAVE_FUNOPEN WORDS_BIGENDIAN
   HAVE_RPM_DB_H HAVE_PGPDIGGETPARAMS
-  ENABLE_RPMDB ENABLE_RPMDB_PUBKEY ENABLE_RPMMD ENABLE_SUSEREPO ENABLE_COMPS
+  ENABLE_RPMDB ENABLE_PUBKEY ENABLE_RPMMD ENABLE_SUSEREPO ENABLE_COMPS
   ENABLE_HELIXREPO ENABLE_MDKREPO ENABLE_ARCHREPO ENABLE_DEBIAN ENABLE_HAIKU
   ENABLE_LZMA_COMPRESSION ENABLE_BZIP2_COMPRESSION ENABLE_PGPVRFY)
   IF(${VAR})
diff --git a/bindings/solv.i b/bindings/solv.i
index 1e2e7fe..0410466 100644
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -410,8 +410,8 @@ typedef int bool;
 #ifdef ENABLE_RPMDB
 #include "repo_rpmdb.h"
 #endif
-#ifdef ENABLE_RPMDB_PUBKEYS
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
 #endif
 #ifdef ENABLE_DEBIAN
 #include "repo_deb.h"
@@ -1439,10 +1439,12 @@ rb_eval_string(
     return new_XSolvable($self->pool, repo_add_rpm($self, name, flags));
   }
 #endif
-#ifdef ENABLE_RPMDB_PUBKEYS
+#ifdef ENABLE_PUBKEY
+#ifdef ENABLE_RPMDB
   bool add_rpmdb_pubkeys(int flags = 0) {
     return repo_add_rpmdb_pubkeys($self, flags) == 0;
   }
+#endif
   %newobject add_pubkey;
   XSolvable *add_pubkey(const char *key, int flags = 0) {
     return new_XSolvable($self->pool, repo_add_pubkey($self, key, flags));
diff --git a/examples/solv.c b/examples/solv.c
index 293e45d..9b6bd48 100644
--- a/examples/solv.c
+++ b/examples/solv.c
@@ -64,8 +64,8 @@
 #include "repo_rpmdb.h"
 #include "pool_fileconflicts.h"
 #endif
-#ifdef ENABLE_RPMDB_PUBKEY
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
 #endif
 #ifdef ENABLE_DEBIAN
 #include "repo_deb.h"
@@ -1008,7 +1008,7 @@ static Pool *
 read_sigs()
 {
   Pool *sigpool = pool_create();
-#if defined(ENABLE_RPMDB_PUBKEY)
+#if defined(ENABLE_PUBKEY) && defined(ENABLE_RPMDB)
   Repo *repo = repo_create(sigpool, "rpmdbkeys");
   repo_add_rpmdb_pubkeys(repo, 0);
 #endif
diff --git a/ext/CMakeLists.txt b/ext/CMakeLists.txt
index ccec994..9da10d7 100644
--- a/ext/CMakeLists.txt
+++ b/ext/CMakeLists.txt
@@ -11,12 +11,12 @@ IF (ENABLE_RPMDB)
         pool_fileconflicts.h repo_rpmdb.h)
 ENDIF (ENABLE_RPMDB)
 
-IF (ENABLE_RPMDB_PUBKEY)
+IF (ENABLE_PUBKEY)
     SET (libsolvext_SRCS ${libsolvext_SRCS}
-	repo_rpmdb_pubkey.c)
+	repo_pubkey.c)
     SET (libsolvext_HEADERS ${libsolvext_SRCS}
-	repo_rpmdb_pubkey.h)
-ENDIF (ENABLE_RPMDB_PUBKEY)
+	repo_pubkey.h)
+ENDIF (ENABLE_PUBKEY)
 
 IF (ENABLE_PGPVRFY)
     SET (libsolvext_SRCS ${libsolvext_SRCS}
diff --git a/ext/repo_rpmdb_pubkey.c b/ext/repo_pubkey.c
index eb9f905..61ae880 100644
--- a/ext/repo_rpmdb_pubkey.c
+++ b/ext/repo_pubkey.c
@@ -6,9 +6,9 @@
  */
 
 /*
- * repo_rpmdb_pubkey
+ * repo_pubkey
  *
- * support for pubkeys stored in the rpmdb database
+ * support for pubkey reading
  *
  */
 
diff --git a/ext/repo_rpmdb_pubkey.h b/ext/repo_pubkey.h
index a9f9e73..a9f9e73 100644
--- a/ext/repo_rpmdb_pubkey.h
+++ b/ext/repo_pubkey.h
diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c
index c0a2fc3..e6ed72a 100644
--- a/tools/rpmdb2solv.c
+++ b/tools/rpmdb2solv.c
@@ -25,8 +25,8 @@
 #include "pool.h"
 #include "repo.h"
 #include "repo_rpmdb.h"
-#ifdef ENABLE_RPMDB_PUBKEY
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
 #endif
 #include "repo_products.h"
 #include "repo_solv.h"
@@ -63,7 +63,7 @@ main(int argc, char **argv)
   char *proddir = 0;
 #endif
   char *outfile = 0;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
   int pubkeys = 0;
 #endif
 
@@ -99,7 +99,7 @@ main(int argc, char **argv)
       case 'o':
         outfile = optarg;
         break;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
       case 'k':
         nopacks = 1;
         pubkeys = 1;
@@ -150,7 +150,7 @@ main(int argc, char **argv)
 	  exit(1);
 	}
     }
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
   if (pubkeys)
     {
       if (repo_add_rpmdb_pubkeys(repo, REPO_USE_ROOTDIR | REPO_REUSE_REPODATA | REPO_NO_INTERNALIZE))
diff --git a/tools/rpms2solv.c b/tools/rpms2solv.c
index 63a7f28..93ee8c3 100644
--- a/tools/rpms2solv.c
+++ b/tools/rpms2solv.c
@@ -20,8 +20,8 @@
 #include "pool.h"
 #include "repo.h"
 #include "repo_rpmdb.h"
-#ifdef ENABLE_RPMDB_PUBKEY
-#include "repo_rpmdb_pubkey.h"
+#ifdef ENABLE_PUBKEY
+#include "repo_pubkey.h"
 #endif
 #include "repo_solv.h"
 #include "common_write.h"
@@ -61,7 +61,7 @@ main(int argc, char **argv)
   FILE *fp;
   char buf[4096], *p;
   const char *basefile = 0;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
   int pubkeys = 0;
 #endif
 
@@ -78,7 +78,7 @@ main(int argc, char **argv)
 	case '0':
 	  manifest0 = 1;
 	  break;
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
 	case 'k':
 	  pubkeys = 1;
 	  break;
@@ -126,7 +126,7 @@ main(int argc, char **argv)
   res = 0;
   for (i = 0; i < nrpms; i++)
     {
-#ifdef ENABLE_RPMDB_PUBKEY
+#ifdef ENABLE_PUBKEY
      if (pubkeys)
        {
 	  if (repo_add_pubkey(repo, rpms[i], REPO_REUSE_REPODATA|REPO_NO_INTERNALIZE) == 0)