- fix python install

- rel 6

diff --git a/hugin.spec b/hugin.spec
index c56467bb3358a1607a3ab54ba450cfb09e5a98e1..5565a107d9bd27a3b032d1d9234785702a183d37 100644 (file)
--- a/hugin.spec
+++ b/hugin.spec
@@ -2,7 +2,7 @@ Summary:        Toolchain to create panoramic images
 Summary(pl.UTF-8):     Zestaw narzędzi do tworzenia panoramicznych zdjęć
 Name:          hugin
 Version:       2014.0.0
-Release:       5
+Release:       6
 License:       GPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/hugin/%{name}-%{version}.tar.bz2
@@ -13,6 +13,7 @@ Patch2:               %{name}-boost.patch
 Patch3:                boost-1.57.0.patch
 Patch4:                no-sysctl.patch
 Patch5:                lensfun-0.3.patch
+Patch6:                python-install.patch
 URL:           http://hugin.sourceforge.net/
 BuildRequires: OpenEXR-devel
 BuildRequires: OpenGL-glut-devel
@@ -72,6 +73,7 @@ i ekspozycji, więc warto zainstalować pakiet enblend-enfuse.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 mv -f src/translations/{cs_CZ,cs}.po
 

diff --git a/python-install.patch b/python-install.patch
new file mode 100644 (file)
index 0000000..ecf4560
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,11 @@
+--- hugin-2014.0.0/src/hugin_script_interface/CMakeLists.txt~  2014-10-08 20:19:19.000000000 +0200
++++ hugin-2014.0.0/src/hugin_script_interface/CMakeLists.txt   2015-12-18 21:44:50.807185809 +0100
+@@ -203,7 +203,7 @@
+     # Linux/MacOS
+     # install Python related files into folder depending on used Python version
+ 
+-    EXECUTE_PROCESS( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))"
++    EXECUTE_PROCESS( COMMAND ${PYTHON_EXECUTABLE} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(plat_specific=True, prefix='/usr'))"
+                      OUTPUT_VARIABLE pyinstalldir
+                      OUTPUT_STRIP_TRAILING_WHITESPACE)
+