[packages/graphviz] - fix python paths detection - rel 16

baggins baggins at pld-linux.org
Sun Dec 27 14:50:58 CET 2015


commit 39c811b70a6f953b695c3d6062ca3ff9c8e94ce7
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun Dec 27 14:50:41 2015 +0100

    - fix python paths detection
    - rel 16

 graphviz.spec      |  4 +++-
 python-paths.patch | 18 ++++++++++++++++++
 2 files changed, 21 insertions(+), 1 deletion(-)
---
diff --git a/graphviz.spec b/graphviz.spec
index d931854..5ed3760 100644
--- a/graphviz.spec
+++ b/graphviz.spec
@@ -45,7 +45,7 @@ Summary:	Graph Visualization Tools
 Summary(pl.UTF-8):	Narzędzie do wizualizacji w postaci grafów
 Name:		graphviz
 Version:	2.38.0
-Release:	15
+Release:	16
 License:	CPL v1.0
 Group:		X11/Applications/Graphics
 Source0:	http://www.graphviz.org/pub/graphviz/ARCHIVE/%{name}-%{version}.tar.gz
@@ -61,6 +61,7 @@ Patch10:	%{name}-ming.patch
 Patch11:	%{name}-visio.patch
 Patch12:	%{name}-webp.patch
 Patch13:	%{name}-format.patch
+Patch14:	python-paths.patch
 URL:		http://www.graphviz.org/
 %{?with_devil:BuildRequires:	DevIL-devel}
 %{?with_r:BuildRequires:	R}
@@ -458,6 +459,7 @@ Wiązania graphviza dla języka R.
 %patch11 -p1
 %patch12 -p1
 %patch13 -p1
+%patch14 -p1
 
 %{__sed} '1s@/usr/bin/lua$@/usr/bin/lua5.1@' -i tclpkg/gv/demo/modgraph.lua
 
diff --git a/python-paths.patch b/python-paths.patch
new file mode 100644
index 0000000..1c71522
--- /dev/null
+++ b/python-paths.patch
@@ -0,0 +1,18 @@
+--- graphviz-2.38.0/config/config_python.py~	2014-04-13 22:40:25.000000000 +0200
++++ graphviz-2.38.0/config/config_python.py	2015-12-27 14:46:09.464163577 +0100
+@@ -2,11 +2,11 @@
+ from distutils import sysconfig
+ 
+ if sys.argv[1] == "archlib":
+-    print sysconfig.get_python_lib(1,1)
++    print sysconfig.get_python_lib(plat_specific=True, standard_lib=True, prefix='/usr')
+ elif sys.argv[1] == "lib":
+-    print sysconfig.get_python_lib(0,1)
++    print sysconfig.get_python_lib(plat_specific=False, standard_lib=True, prefix='/usr')
+ elif sys.argv[1] == "archsitelib":
+-    print sysconfig.get_python_lib(1,0)
++    print sysconfig.get_python_lib(plat_specific=True, standard_lib=False, prefix='/usr')
+ elif sys.argv[1] == "sitelib":
+-    print sysconfig.get_python_lib(0,0)
++    print sysconfig.get_python_lib(plat_specific=False, standard_lib=False, prefix='/usr')
+ 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/graphviz.git/commitdiff/39c811b70a6f953b695c3d6062ca3ff9c8e94ce7



More information about the pld-cvs-commit mailing list