ENDMACRO(ADD_TESTS)
####################################################################
+# prefer packages using the same install prefix as we do
+SET(CMAKE_PREFIX_PATH ${CMAKE_INSTALL_PREFIX} usr/localX /usr/local /usr)
FIND_PACKAGE(Rpm REQUIRED)
IF ( NOT RPM_FOUND)
INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
ENDIF( NOT ZLIB_FOUND)
-FIND_PACKAGE(Satsolver REQUIRED)
-IF ( NOT SATSOLVER_FOUND )
- MESSAGE( FATAL_ERROR " libsatsolver not found" )
-ELSE ( NOT SATSOLVER_FOUND )
- INCLUDE_DIRECTORIES( ${SATSOLVER_INCLUDE_DIR} )
-ENDIF( NOT SATSOLVER_FOUND )
+#SET(LibSolv_USE_STATIC_LIBS ON)
+FIND_PACKAGE(LibSolv REQUIRED ext)
+IF ( NOT LibSolv_FOUND )
+ MESSAGE( FATAL_ERROR " libsolv not found" )
+ELSE()
+ INCLUDE_DIRECTORIES( ${LibSolv_INCLUDE_DIRS} )
+ENDIF()
-# satsolver uses expat and has open references to it:
+# libsolv uses expat and has open references to it:
FIND_PACKAGE(EXPAT REQUIRED)
FIND_PACKAGE(OpenSSL REQUIRED)
+++ /dev/null
-
-if(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY AND SATSOLVER_EXT_LIBRARY)
- # Already in cache, be silent
- set(SATSOLVER_FIND_QUIETLY TRUE)
-endif(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY AND SATSOLVER_EXT_LIBRARY)
-
-set(SATSOLVER_LIBRARY)
-set(SATSOLVER_EXT_LIBRARY)
-set(SATSOLVER_INCLUDE_DIR)
-
-FIND_PATH(SATSOLVER_INCLUDE_DIR satsolver/solvable.h
- ${CMAKE_INSTALL_PREFIX}/include
- /usr/local/include
- /usr/include
-)
-
-FIND_LIBRARY(SATSOLVER_LIBRARY NAMES satsolver
- PATHS
- ${CMAKE_INSTALL_PREFIX}/lib
- /usr/local/lib
- /usr/lib
-)
-
-FIND_LIBRARY(SATSOLVER_EXT_LIBRARY NAMES satsolverext
- PATHS
- ${CMAKE_INSTALL_PREFIX}/lib
- /usr/local/lib
- /usr/lib
-)
-
-if(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY)
- MESSAGE( STATUS "satsolver found: includes in ${SATSOLVER_INCLUDE_DIR}, library in ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY} ")
- set(SATSOLVER_FOUND TRUE)
-else(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY)
- MESSAGE( STATUS "** satsolver not found")
- MESSAGE( STATUS "** install package libsatsolver-devel")
- MESSAGE( STATUS "** (http://svn.opensuse.org/svn/zypp/trunk/sat-solver)")
-endif(SATSOLVER_INCLUDE_DIR AND SATSOLVER_LIBRARY)
-
-MARK_AS_ADVANCED(SATSOLVER_INCLUDE_DIR SATSOLVER_LIBRARY)
BuildRequires: libxml2-devel
BuildRequires: libproxy-devel
-BuildRequires: libsatsolver-devel >= 0.14.17
+BuildRequires: libsolv-devel
%if 0%{?suse_version} >= 1100
-%requires_eq satsolver-tools
+%requires_eq libsolv-tools
%else
-Requires: satsolver-tools
+Requires: libsolv-tools
%endif
# required for testsuite, webrick
Requires: gnupg2
%endif
-%define min_aria_version 1.1.2
# ---------------------------------------------------------------
%if 0%{?suse_version} >= 1110
# (almost) common codebase, but on SLES11-SP1 (according to Rudi
Requires: libcurl-devel >= %{min_curl_version}
%endif
%if 0%{?suse_version} >= 1100
-%requires_ge libsatsolver-devel
+%requires_ge libsolv-devel
%else
-Requires: libsatsolver-devel
+Requires: libsolv-devel
%endif
Summary: Package, Patch, Pattern, and Product Management - developers files
Group: System/Packages
SET_LOGGROUP( "zypp" ${zypp_lib_SRCS} )
# override some defaults
-SET_LOGGROUP( "satsolver" ${zypp_sat_SRCS} )
+SET_LOGGROUP( "libsolv" ${zypp_sat_SRCS} )
#SET_LOGGROUP( "group" ${zypp_target_rpm_SRCS} )
#SET_LOGGROUP( "group" ${zypp_parser_yum2_SRCS} )
#SET_LOGGROUP( "group" ${zypp_capability_SRCS} )
TARGET_LINK_LIBRARIES(zypp ${CURL_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${LIBXML_LIBRARY} )
TARGET_LINK_LIBRARIES(zypp ${ZLIB_LIBRARY} )
-TARGET_LINK_LIBRARIES(zypp ${SATSOLVER_LIBRARY} ${SATSOLVER_EXT_LIBRARY} ${EXPAT_LIBRARY})
+TARGET_LINK_LIBRARIES(zypp ${LibSolv_LIBRARIES} ${EXPAT_LIBRARY})
TARGET_LINK_LIBRARIES(zypp ${OPENSSL_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${CRYPTO_LIBRARIES} )
TARGET_LINK_LIBRARIES(zypp ${SIGNALS_LIBRARY} )