[packages/qscintilla2] - fix python install paths

baggins baggins at pld-linux.org
Sat Dec 5 19:54:27 CET 2015


commit 0279988b2bdb0513cf13c19f551f0ccac2a275c4
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat Dec 5 19:54:14 2015 +0100

    - fix python install paths

 python-install.patch | 11 +++++++++++
 qscintilla2.spec     |  3 +++
 2 files changed, 14 insertions(+)
---
diff --git a/qscintilla2.spec b/qscintilla2.spec
index 2940f8e..39040f7 100644
--- a/qscintilla2.spec
+++ b/qscintilla2.spec
@@ -29,6 +29,7 @@ Patch2:		%{name}-make.patch
 Patch3:		%{name}-outoftree.patch
 Patch4:		%{name}-qt5.patch
 Patch5:		%{name}-link.patch
+Patch6:		python-install.patch
 URL:		http://www.riverbankcomputing.co.uk/software/qscintilla/
 %if %{with python2}
 BuildRequires:	python-sip-devel >= 2:%{sip_ver}
@@ -55,6 +56,7 @@ BuildRequires:	python3-PyQt4 >= %{pyqt4_ver}
 BuildRequires:	Qt5Designer-devel >= 5
 BuildRequires:	Qt5Gui-devel >= 5
 BuildRequires:	Qt5PrintSupport-devel >= 5
+BuildRequires:	Qt5UiTools-devel >= 5
 BuildRequires:	Qt5Widgets-devel >= 5
 BuildRequires:	qt5-build >= 5
 BuildRequires:	qt5-qmake >= 5
@@ -295,6 +297,7 @@ Wiązania Pythona 3 dla komponentu QScintilla2 (wersja dla PyQt5).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 for qt in %{?with_qt4:qt4} %{?with_qt5:qt5} ; do
diff --git a/python-install.patch b/python-install.patch
new file mode 100644
index 0000000..7b45f1d
--- /dev/null
+++ b/python-install.patch
@@ -0,0 +1,11 @@
+--- QScintilla-gpl-2.9.1/Python/configure.py~	2015-12-05 19:19:23.000000000 +0100
++++ QScintilla-gpl-2.9.1/Python/configure.py	2015-12-05 19:53:29.639660268 +0100
+@@ -619,7 +619,7 @@
+ 
+         self.inc_dir = sysconfig.get_python_inc()
+         self.venv_inc_dir = sysconfig.get_python_inc(prefix=sys.prefix)
+-        self.module_dir = sysconfig.get_python_lib(plat_specific=1)
++        self.module_dir = sysconfig.get_python_lib(plat_specific=1,standard_lib=1)
+ 
+         if sys.platform == 'win32':
+             self.data_dir = sys.prefix
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qscintilla2.git/commitdiff/0279988b2bdb0513cf13c19f551f0ccac2a275c4



More information about the pld-cvs-commit mailing list