[packages/libsolv] - fix python install path - rel 7

baggins baggins at pld-linux.org
Mon Dec 28 00:33:23 CET 2015


commit 085c0a982d78bd51f35f5fca37e6a18e0bba8cde
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Mon Dec 28 00:33:01 2015 +0100

    - fix python install path
    - rel 7

 libsolv-python.patch | 6 ++++--
 libsolv.spec         | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)
---
diff --git a/libsolv.spec b/libsolv.spec
index 0627dee..1788bf6 100644
--- 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
diff --git a/libsolv-python.patch b/libsolv-python.patch
index 8c313c6..d293c66 100644
--- 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)
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list