- fix fedora builds (bnc#444211)

  (cmake needs to be called with -DFEDORA:=1)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59b9cc9..ba50426 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -35,7 +35,13 @@ FIND_PACKAGE(EXPAT REQUIRED)
 FIND_PACKAGE(Check REQUIRED)
 FIND_PACKAGE(ZLIB REQUIRED)
 
+IF ( FEDORA )
+MESSAGE(STATUS "Building for Fedora")
+ADD_DEFINITIONS( -DFEDORA )
+FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm)
+ELSE ( FEDORA )
 FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
+ENDIF ( FEDORA)
 
 SET( PACKAGE "satsolver" )
 SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" )

diff --git a/tools/repo_rpmdb.c b/tools/repo_rpmdb.c
index e7b4596..2b077fc 100644 (file)
--- a/tools/repo_rpmdb.c
+++ b/tools/repo_rpmdb.c
@@ -22,7 +22,11 @@
 #include <unistd.h>
 #include <assert.h>
 
+#ifdef FEDORA
+#include <db4/db.h>
+#else
 #include <rpm/db.h>
+#endif
 
 #include "pool.h"
 #include "repo.h"
@@ -1274,7 +1278,12 @@ repo_add_rpmdb(Repo *repo, Repo *ref, const char *rootdir, int flags)
       exit(1);
     }
   snprintf(dbpath, PATH_MAX, "%s/var/lib/rpm", rootdir);
+  /* should look in /usr/lib/rpm/macros instead, but we want speed... */
+#ifdef FEDORA
+  if (dbenv->open(dbenv, dbpath, DB_CREATE|DB_INIT_CDB|DB_INIT_MPOOL, 0))
+#else
   if (dbenv->open(dbenv, dbpath, DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL, 0))
+#endif
     {
       perror("dbenv open");
       exit(1);