Author: mlschroe
Date: Wed Feb 20 11:50:43 2008
New Revision: 8828
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8828&view=rev
Log:
- link against rpmdb, not db43
Removed:
trunk/sat-solver/cmake/modules/FindDb43.cmake
Modified:
trunk/sat-solver/CMakeLists.txt
trunk/sat-solver/package/libsatsolver.spec.in
trunk/sat-solver/tools/CMakeLists.txt
trunk/sat-solver/tools/repo_rpmdb.c
Modified: trunk/sat-solver/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/CMakeLists.txt?rev=8828&r1=8827&r2=8828&view=diff
==============================================================================
--- trunk/sat-solver/CMakeLists.txt (original)
+++ trunk/sat-solver/CMakeLists.txt Wed Feb 20 11:50:43 2008
@@ -21,9 +21,9 @@
INCLUDE( ${CMAKE_SOURCE_DIR}/VERSION.cmake )
-FIND_PACKAGE(Db43 REQUIRED)
FIND_PACKAGE(EXPAT REQUIRED)
#FIND_PACKAGE(Ruby REQUIRED)
+FIND_LIBRARY(RPMDB_LIBRARY NAMES rpmdb)
SET( PACKAGE "satsolver" )
SET( VERSION "${LIBSATSOLVER_MAJOR}.${LIBSATSOLVER_MINOR}.${LIBSATSOLVER_PATCH}" )
Modified: trunk/sat-solver/package/libsatsolver.spec.in
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/package/libsatsolver.spec.in?rev=8828&r1=8827&r2=8828&view=diff
==============================================================================
--- trunk/sat-solver/package/libsatsolver.spec.in (original)
+++ trunk/sat-solver/package/libsatsolver.spec.in Wed Feb 20 11:50:43 2008
@@ -7,7 +7,7 @@
Source: satsolver-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: Development/Libraries/C and C++
-BuildRequires: cmake db43-devel gcc-c++ libexpat-devel ruby-devel swig
+BuildRequires: cmake rpm-devel gcc-c++ libexpat-devel ruby-devel swig
Summary: A new approach to package dependency solving
%description
Modified: trunk/sat-solver/tools/CMakeLists.txt
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/CMakeLists.txt?rev=8828&r1=8827&r2=8828&view=diff
==============================================================================
--- trunk/sat-solver/tools/CMakeLists.txt (original)
+++ trunk/sat-solver/tools/CMakeLists.txt Wed Feb 20 11:50:43 2008
@@ -8,7 +8,7 @@
)
ADD_EXECUTABLE( rpmdb2solv ${rpmdb2solv_REPOS} )
-TARGET_LINK_LIBRARIES( rpmdb2solv satsolver ${DB43_LIBRARY})
+TARGET_LINK_LIBRARIES( rpmdb2solv satsolver ${RPMDB_LIBRARY})
SET(rpmmd2solv_REPOS rpmmd2solv.c repo_rpmmd.h repo_rpmmd.c repo_write.c common_write.c )
ADD_EXECUTABLE( rpmmd2solv ${rpmmd2solv_REPOS} )
Modified: trunk/sat-solver/tools/repo_rpmdb.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/repo_rpmdb.c?rev=8828&r1=8827&r2=8828&view=diff
==============================================================================
--- trunk/sat-solver/tools/repo_rpmdb.c (original)
+++ trunk/sat-solver/tools/repo_rpmdb.c Wed Feb 20 11:50:43 2008
@@ -20,7 +20,7 @@
#include