[packages/vigra] - fix python install path - rel 11

baggins baggins at pld-linux.org
Sun Dec 13 12:07:47 CET 2015


commit d6aa230b6878ee9bd0bda37d9fa79366d0a4fc4d
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 13 12:07:33 2015 +0100

    - fix python install path
    - rel 11

 python-install.patch | 11 +++++++++++
 vigra.spec           |  4 +++-
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/vigra.spec b/vigra.spec
index 0cac60e..6eb4c1b 100644
--- a/vigra.spec
+++ b/vigra.spec
@@ -3,12 +3,13 @@ Summary:	Generic Programming for Computer Vision
 Summary(pl.UTF-8):	Ogólne programowanie obrazu komputerowego
 Name:		vigra
 Version:	1.10.0
-Release:	10
+Release:	11
 License:	MIT
 Group:		Libraries
 #Source0Download: http://ukoethe.github.io/vigra/#download
 Source0:	https://github.com/ukoethe/vigra/releases/download/Version-1-10-0/%{name}-%{version}-src-with-docu.tar.gz
 # Source0-md5:	85e2968e4ee5f9541b5dd8b3fb9cc433
+Patch0:		python-install.patch
 URL:		http://hci.iwr.uni-heidelberg.de/vigra/
 BuildRequires:	OpenEXR-devel
 BuildRequires:	boost-python-devel >= 1.40.0
@@ -107,6 +108,7 @@ Dokumentacja programisty do biblioteki vigra.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %cmake . \
diff --git a/python-install.patch b/python-install.patch
new file mode 100644
index 0000000..58e0a87
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,11 @@
+--- vigra-1.10.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake~	2013-11-18 17:48:16.000000000 +0100
++++ vigra-1.10.0/config/FindVIGRANUMPY_DEPENDENCIES.cmake	2015-12-13 12:02:56.897894584 +0100
+@@ -70,7 +70,7 @@
+     ######################################################################
+     IF(NOT DEFINED VIGRANUMPY_INSTALL_DIR OR VIGRANUMPY_INSTALL_DIR MATCHES "^$")
+         execute_process(COMMAND ${PYTHON_EXECUTABLE} -c
+-                         "from distutils.sysconfig import *; print get_python_lib(1)"
++                         "from distutils.sysconfig import *; print get_python_lib(plat_specific=True, prefix='/usr')"
+                           OUTPUT_VARIABLE PYTHON_SITE_PACKAGES OUTPUT_STRIP_TRAILING_WHITESPACE)
+         FILE(TO_CMAKE_PATH ${PYTHON_SITE_PACKAGES} VIGRANUMPY_INSTALL_DIR)
+     ENDIF()
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vigra.git/commitdiff/d6aa230b6878ee9bd0bda37d9fa79366d0a4fc4d



More information about the pld-cvs-commit mailing list