[packages/libsolv] - up to 0.7.17 - cleanup cmake options

[baggins]

commit efdbc54e8146a0ebbcc9cd5e510b36fd49661905
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Feb 22 13:56:30 2021 +0100

    - up to 0.7.17
    - cleanup cmake options

 libsolv-python.patch |  4 ++--
 libsolv.spec         | 11 +++++------
 ruby.patch           |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)
---
diff --git a/libsolv.spec b/libsolv.spec
index 044acd8..1ce987b 100644
--- 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/libsolv-python.patch b/libsolv-python.patch
index f0f9cb5..f45bc87 100644
--- 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/ruby.patch b/ruby.patch
index 13a0b36..af08311 100644
--- 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")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/libsolv.git/commitdiff/efdbc54e8146a0ebbcc9cd5e510b36fd49661905