[packages/python-pysvn] - fix building on x32 - rel 2

baggins baggins at pld-linux.org
Sun May 10 15:43:23 CEST 2015


commit c5c9a8e1e3f499ee49e5fac3646383ac2c67f023
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sun May 10 15:43:11 2015 +0200

    - fix building on x32
    - rel 2

 python-pysvn.spec |  4 +++-
 x32.patch         | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 1 deletion(-)
---
diff --git a/python-pysvn.spec b/python-pysvn.spec
index f99fedb..b1a6665 100644
--- a/python-pysvn.spec
+++ b/python-pysvn.spec
@@ -5,12 +5,13 @@ Summary:	Python SVN Tools
 Summary(pl.UTF-8):	Narzędzia do SVN w Pythonie
 Name:		python-%{module}
 Version:	1.7.6
-Release:	1
+Release:	2
 License:	Apache
 Group:		Development/Languages/Python
 Source0:	http://pysvn.barrys-emacs.org/source_kits/%{module}-%{version}.tar.gz
 # Source0-md5:	010a80f0058713209d62e96b20afbde9
 Patch0:		%{name}-apr-util.patch
+Patch1:		x32.patch
 URL:		http://pysvn.tigris.org/
 BuildRequires:	apr-devel
 BuildRequires:	apr-util-devel
@@ -46,6 +47,7 @@ Cechy pysvn:
 %prep
 %setup  -q -n %{module}-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd Source
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..d6476a1
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,46 @@
+--- pysvn-1.7.6/Source/setup_configure.py~	2015-05-10 15:38:50.000000000 +0200
++++ pysvn-1.7.6/Source/setup_configure.py	2015-05-10 15:42:08.032391956 +0200
+@@ -977,8 +977,10 @@
+         self._find_paths_svn_lib = [
+                         '/opt/local/lib',                       # Darwin - darwin ports
+                         '/sw/lib',                              # Darwin - Fink
++                        '/usr/libx32',                           # typical 64bit Linux
+                         '/usr/lib64',                           # typical 64bit Linux
+                         '/usr/lib',                             # typical Linux
++                        '/usr/local/libx32',                     # typical 64bit Linux
+                         '/usr/local/lib64',                     # typical 64bit Linux
+                         '/usr/local/lib',                       # typical *BSD
+                         '/usr/pkg/lib',                         # netbsd
+@@ -999,8 +1001,10 @@
+         self._find_paths_apr_lib = [
+                         '/opt/local/lib',                       # Darwin - darwin ports
+                         '/sw/lib',                              # Darwin - fink
++                        '/usr/libx32',                           # typical 64bit Linux
+                         '/usr/lib64',                           # typical 64bit Linux
+                         '/usr/lib',                             # typical Linux
++                        '/usr/local/libx32',                     # typical 64bit Linux
+                         '/usr/local/lib64',                     # typical 64bit Linux
+                         '/usr/local/lib',                       # typical *BSD
+                         '/usr/local/apr/lib',                   # Mac OS X www.metissian.com
+@@ -1089,8 +1093,10 @@
+                         '/usr/pkg/bin',                                # netbsd
+                         ]
+         self._find_paths_svn_lib = [
++                        '/usr/libx32',                           # typical 64bit Linux
+                         '/usr/lib64',                           # typical 64bit Linux
+                         '/usr/lib',                             # typical Linux
++                        '/usr/local/libx32',                     # typical 64bit Linux
+                         '/usr/local/lib64',                     # typical 64bit Linux
+                         '/usr/local/lib',                       # typical *BSD
+                         '/usr/pkg/lib',                         # netbsd
+@@ -1106,8 +1112,10 @@
+                         ]
+         self._find_paths_apr_util_inc = self._find_paths_apr_inc
+         self._find_paths_apr_lib = [
++                        '/usr/libx32',                           # typical 64bit Linux
+                         '/usr/lib64',                           # typical 64bit Linux
+                         '/usr/lib',                             # typical Linux
++                        '/usr/local/libx32',                     # typical 64bit Linux
+                         '/usr/local/lib64',                     # typical 64bit Linux
+                         '/usr/local/lib',                       # typical *BSD
+                         '/usr/local/apr/lib',                   # Mac OS X www.metissian.com
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-pysvn.git/commitdiff/c5c9a8e1e3f499ee49e5fac3646383ac2c67f023



More information about the pld-cvs-commit mailing list