- fix python install path

- rel 7

diff --git a/libsolv-python.patch b/libsolv-python.patch
index 8c313c6cfd52fa7e2617e3671546c6acb8e50c1e..d293c66832b1c59f6c4701526566a1412e5368a5 100644 (file)
--- a/libsolv-python.patch
+++ b/libsolv-python.patch
@@ -1,13 +1,15 @@
 --- libsolv-0.6.6/bindings/python/CMakeLists.txt.orig  2014-10-07 14:41:37.000000000 +0200
 +++ libsolv-0.6.6/bindings/python/CMakeLists.txt       2014-10-25 10:42:06.870708523 +0200
-@@ -1,8 +1,8 @@
+@@ -1,9 +1,9 @@
  #SET (PythonLibs_FIND_VERSION 3)
  
  FIND_PACKAGE (PythonLibs)
 -SET (PythonInterp_FIND_VERSION ${PYTHONLIBS_VERSION_STRING})
 -FIND_PACKAGE (PythonInterp 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)
 +#SET (PythonInterp_FIND_VERSION ${PYTHONLIBS_VERSION_STRING})
 +FIND_PACKAGE (PythonInterp ${PYTHONLIBS_VERSION_STRING} 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)
  
  IF (NOT DEFINED PYTHON_VERSION_MAJOR)
+     SET (PYTHON_VERSION_MAJOR 2)

diff --git a/libsolv.spec b/libsolv.spec
index 0627deee04db1719cb5e3176865ae2660ac77f83..1788bf67aeb00fd2f00cdc91766bba8d72be5bef 100644 (file)
--- a/libsolv.spec
+++ b/libsolv.spec
@@ -9,7 +9,7 @@ Summary:        Package dependency solver
 Summary(pl.UTF-8):     Biblioteka do rozwiązywania zależności pakietów
 Name:          libsolv
 Version:       0.6.8
-Release:       6
+Release:       7
 License:       BSD
 Group:         Libraries
 Source0:       https://github.com/openSUSE/libsolv/archive/%{version}/%{name}-%{version}.tar.gz