[packages/avogadro] - fix python module install - rel 16

baggins baggins at pld-linux.org
Sun Dec 27 12:56:32 CET 2015


commit da0ef5d8f41c9370b166902d5b616371b59614e2
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 27 12:56:18 2015 +0100

    - fix python module install
    - rel 16

 avogadro.spec        |  4 +++-
 python-install.patch | 11 +++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)
---
diff --git a/avogadro.spec b/avogadro.spec
index 6f83ff5..4fbb699 100644
--- a/avogadro.spec
+++ b/avogadro.spec
@@ -1,7 +1,7 @@
 Summary:	An advanced molecular editor for chemical purposes
 Name:		avogadro
 Version:	1.0.3
-Release:	15
+Release:	16
 License:	GPL v2
 Group:		Applications/Editors
 Source0:	http://downloads.sourceforge.net/avogadro/%{name}-%{version}.tar.bz2
@@ -10,6 +10,7 @@ Patch0:		%{name}-linguist.patch
 Patch1:		%{name}-cmake.patch
 Patch2:		%{name}-moc-boost.patch
 Patch3:		link-X11.patch
+Patch4:		python-install.patch
 URL:		http://avogadro.openmolecules.net/
 BuildRequires:	QtNetwork-devel
 BuildRequires:	QtOpenGL-devel
@@ -61,6 +62,7 @@ libraries.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 install -d build
diff --git a/python-install.patch b/python-install.patch
new file mode 100644
index 0000000..5e6c96e
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,11 @@
+--- avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt~	2011-04-25 07:22:18.000000000 +0200
++++ avogadro-1.0.3/libavogadro/src/python/CMakeLists.txt	2015-12-27 12:52:50.039007792 +0100
+@@ -25,7 +25,7 @@
+ 
+ # Let's try to use this instead:
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c
+-    "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(1))"
++    "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(plat_specific=1, prefix='/usr'))"
+     OUTPUT_VARIABLE PYTHON_LIB_PATH)
+ 
+ message(STATUS "Python site-packages directory: ${PYTHON_LIB_PATH}")
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/avogadro.git/commitdiff/da0ef5d8f41c9370b166902d5b616371b59614e2



More information about the pld-cvs-commit mailing list