- up to 0.7.17

- cleanup cmake options

diff --git a/libsolv-python.patch b/libsolv-python.patch
index f0f9cb5c9962c9599e8cd00ead1bd7a703ef6571..f45bc879be50e5455165e090c95d06cc40106894 100644 (file)
--- a/libsolv-python.patch
+++ b/libsolv-python.patch
@@ -1,8 +1,8 @@
 --- libsolv-0.6.19/bindings/python/CMakeLists.txt.orig 2016-02-19 22:55:50.640253346 +0100
 +++ libsolv-0.6.19/bindings/python/CMakeLists.txt      2016-02-19 23:16:50.826867127 +0100
 @@ -2,7 +2,7 @@
- FIND_PACKAGE (PythonLibs REQUIRED)
- FIND_PACKAGE (PythonInterp ${PYTHONLIBS_VERSION_STRING} REQUIRED)
+ ENDIF()
+ FIND_PACKAGE (PythonInterp ${python_version} REQUIRED)
  
 -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
 +EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(plat_specific=True, prefix='/usr'))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)

diff --git a/libsolv.spec b/libsolv.spec
index 044acd82273175496d895a8923de4445fc3f1a8b..1ce987b49cd2a04a625e93b2904c18e2bb69d3f6 100644 (file)
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -9,13 +9,13 @@
 Summary:       Package dependency solver
 Summary(pl.UTF-8):     Biblioteka do rozwiązywania zależności pakietów
 Name:          libsolv
-Version:       0.7.16
-Release:       2
+Version:       0.7.17
+Release:       1
 License:       BSD
 Group:         Libraries
 #Source0Download: https://github.com/openSUSE/libsolv/releases
 Source0:       https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 65a205694b45f9c7c28e25a9ccac8726
+# Source0-md5: 0c0394275be0c5eff1e76abacfb28705
 Patch0:                ruby.patch
 Patch1:                %{name}-python.patch
 Patch2:                %{name}-rpm5.patch
@@ -185,7 +185,6 @@ Wiązania języka Tcl do bibliotek libsolv.
 %{__rm} cmake/modules/FindRuby.cmake
 
 %build
-
 %define common_opts \\\
        -DENABLE_APPDATA=ON \\\
        -DENABLE_BZIP2_COMPRESSION=ON \\\
@@ -194,16 +193,16 @@ Wiązania języka Tcl do bibliotek libsolv.
        -DENABLE_LZMA_COMPRESSION=ON \\\
        -DENABLE_PUBKEY=ON \\\
        -DENABLE_RPMDB=ON \\\
+       %{?with_rpm5:-DRPM5=ON} \\\
        %{?with_rpm5:-DENABLE_RPMDB_BDB=ON} \\\
+       %{?with_rpm5:-DENABLE_RPMPKG=ON} \\\
        %{!?with_rpm5:-DENABLE_RPMDB_LIBRPM=ON} \\\
        %{!?with_rpm5:-DENABLE_RPMPKG_LIBRPM=ON} \\\
        -DENABLE_RPMDB_BYRPMHEADER=ON \\\
        -DENABLE_RPMMD=ON \\\
-       -DENABLE_RPMPKG=ON \\\
        %{?with_static_libs:-DENABLE_STATIC=ON} \\\
        -DENABLE_ZCHUNK_COMPRESSION=ON \\\
        -DENABLE_ZSTD_COMPRESSION=ON \\\
-       -DRPM5=ON \\\
        -DWITH_SYSTEM_ZCHUNK=ON \\\
        %{nil}
 

diff --git a/ruby.patch b/ruby.patch
index 13a0b36fba8cc46669893e9e923dac8a2cfa518a..af083118b4d2a4f06bfb6125e11a5acd75ea80d7 100644 (file)
--- a/ruby.patch
+++ b/ruby.patch
@@ -26,5 +26,5 @@ diff -up libsolv/bindings/ruby/CMakeLists.txt.rubyinclude libsolv/bindings/ruby/
 -INCLUDE_DIRECTORIES (${RUBY_INCLUDE_PATH})
 +INCLUDE_DIRECTORIES (${RUBY_INCLUDE_DIRS})
  
- ADD_LIBRARY (bindings_ruby SHARED solv_ruby.c)
+ ADD_LIBRARY (bindings_ruby MODULE solv_ruby.c)
  SET_TARGET_PROPERTIES (bindings_ruby PROPERTIES PREFIX "" OUTPUT_NAME "solv")