- adapt to build with rpm-4.7

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 829fed4..9f7522a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,11 +38,13 @@ 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)
 
+FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
+IF ( NOT RPMDB_LIBRARY )
+FIND_LIBRARY(RPMDB_LIBRARY NAMES rpm)
+ENDIF( NOT RPMDB_LIBRARY )
+
 SET( PACKAGE "satsolver" )
 SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" )
 

diff --git a/ext/repo_rpmdb.c b/ext/repo_rpmdb.c
index 8947f9a..d87e90f 100644 (file)
--- a/ext/repo_rpmdb.c
+++ b/ext/repo_rpmdb.c
@@ -22,14 +22,14 @@
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef FEDORA
-#include <db4/db.h>
-#else
-#include <rpm/db.h>
-#endif
 #include <rpm/rpmio.h>
 #include <rpm/rpmpgp.h>
 #include <rpm/header.h>
+#include <rpm/rpmdb.h>
+
+#ifndef DB_CREATE
+#include <db4/db.h>
+#endif
 
 #include "pool.h"
 #include "repo.h"