Imported Upstream version 0.6.26

Change-Id: I8a4147097acde9c24e8cbbe614159b797e9547cb
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12b9b32..838f9d0 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -393,9 +393,11 @@ MACRO (SPECFILE)
 ENDMACRO (SPECFILE)
 
 MACRO (PCFILE)
-  MESSAGE (STATUS "Writing pkg-config file...")
+  MESSAGE (STATUS "Writing pkg-config files...")
   CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolv.pc.in ${CMAKE_BINARY_DIR}/libsolv.pc @ONLY)
   INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolv.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
+  CONFIGURE_FILE (${CMAKE_SOURCE_DIR}/libsolvext.pc.in ${CMAKE_BINARY_DIR}/libsolvext.pc @ONLY)
+  INSTALL( FILES ${CMAKE_BINARY_DIR}/libsolvext.pc DESTINATION ${PKGCONFIG_INSTALL_DIR} )
 ENDMACRO (PCFILE)
 
 SPECFILE ()

diff --git a/NEWS b/NEWS
index abb9bda..c4d9f11 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@
 This file contains the major changes between
 libsolv versions:
 
+Version 0.6.26
+- export solvable_matchesdep function, as we now
+  use it in the bindings
+
 Version 0.6.25
 - new features:
   * new SOLVER_FLAG_STRONG_RECOMMENDS flag

diff --git a/VERSION.cmake b/VERSION.cmake
index 3d93005..1d0be13 100644 (file)
--- a/VERSION.cmake
+++ b/VERSION.cmake
@@ -49,5 +49,5 @@ SET(LIBSOLVEXT_SOVERSION "0")
 
 SET(LIBSOLV_MAJOR "0")
 SET(LIBSOLV_MINOR "6")
-SET(LIBSOLV_PATCH "25")
+SET(LIBSOLV_PATCH "26")
 

diff --git a/libsolv.pc.in b/libsolv.pc.in
index c82dfc4..40a8623 100644 (file)
--- a/libsolv.pc.in
+++ b/libsolv.pc.in
@@ -2,7 +2,7 @@ libdir=@LIB_INSTALL_DIR@
 includedir=@INCLUDE_INSTALL_DIR@
 
 Name: libsolv
-Description: Library for solving packages and reading repositories
+Description: Library for solving packages
 Version: @VERSION@
-Libs: -L${libdir} -lsolvext -lsolv
+Libs: -L${libdir} -lsolv
 Cflags: -I${includedir}

diff --git a/libsolvext.pc.in b/libsolvext.pc.in
new file mode 100644 (file)
index 0000000..d48b6fa
--- /dev/null
+++ b/libsolvext.pc.in
@@ -0,0 +1,9 @@
+libdir=@LIB_INSTALL_DIR@
+includedir=@INCLUDE_INSTALL_DIR@
+
+Name: libsolvext
+Description: Library for reading repositories
+Version: @VERSION@
+Requires: libsolv
+Libs: -L${libdir} -lsolvext
+Cflags: -I${includedir}

diff --git a/package/libsolv.changes b/package/libsolv.changes
index d32694e..f772422 100644 (file)
--- a/package/libsolv.changes
+++ b/package/libsolv.changes
@@ -1,4 +1,11 @@
 -------------------------------------------------------------------
+Wed Feb 15 11:34:59 CET 2017 - mls@suse.de
+
+- export solvable_matchesdep function, as we now use it in
+  the bindings
+- bump version to 0.6.26
+
+-------------------------------------------------------------------
 Tue Feb  7 13:13:01 CET 2017 - mls@suse.de
 
 - add SOLVABLE_NAME hack for pool_whatmatchesdep and

diff --git a/src/libsolv.ver b/src/libsolv.ver
index dd1596e..19f98bb 100644 (file)
--- a/src/libsolv.ver
+++ b/src/libsolv.ver
@@ -310,6 +310,7 @@ SOLV_1.0 {
                solvable_lookup_str_poollang;
                solvable_lookup_type;
                solvable_lookup_void;
+               solvable_matchesdep;
                solvable_selfprovidedep;
                solvable_set_deparray;
                solvable_set_id;