[packages/python-bsddb] - fix build on x32 - rel 4

[baggins]

commit d300f666b0ac0c6e0ddd7244ff2f7968f0bc25f5
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Oct 2 22:35:48 2015 +0200

    - fix build on x32
    - rel 4

 python-bsddb.spec |  4 +++-
 x32.patch         | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
---
diff --git a/python-bsddb.spec b/python-bsddb.spec
index 0e9d134..04e2dc9 100644
--- a/python-bsddb.spec
+++ b/python-bsddb.spec
@@ -7,11 +7,12 @@ Summary:	Python interface for BerkeleyDB
 Summary(pl.UTF-8):	Interfejs Pythona do BerkeleyDB
 Name:		python-%{module}
 Version:	6.1.0
-Release:	3
+Release:	4
 License:	BSD-like w/o adv. clause
 Group:		Development/Languages/Python
 Source0:	http://pypi.python.org/packages/source/b/bsddb3/%{pname}-%{version}.tar.gz
 # Source0-md5:	8d998ee04dc05f3808a7edfe3011decc
+Patch0:		x32.patch
 URL:		http://www.argo.es/~jcea/programacion/pybsddb.htm
 BuildRequires:	db-devel >= 4.1.25
 %if %{with python2}
@@ -75,6 +76,7 @@ załączonej dokumentacji lub na stronie WWW.
 
 %prep
 %setup -q -n %{pname}-%{version}
+%patch0 -p1
 
 %build
 %if %{with python2}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..e943939
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,42 @@
+--- bsddb3-6.1.0/setup2.py~	2014-07-21 12:46:55.000000000 +0200
++++ bsddb3-6.1.0/setup2.py	2015-10-02 22:34:14.135486542 +0200
+@@ -206,6 +206,7 @@
+ 
+             lib_dirs = compiler.library_dirs + [
+                 '/lib64', '/usr/lib64',
++                '/libx32', '/usr/libx32',
+                 '/lib', '/usr/lib',
+             ]
+             inc_dirs = compiler.include_dirs + ['/usr/include']
+@@ -250,8 +251,10 @@
+                 # check lib directories parallel to the location of the header
+                 db_dirs_to_check = [
+                     os.path.join(db_incdir, '..', 'lib64'),
++                    os.path.join(db_incdir, '..', 'libx32'),
+                     os.path.join(db_incdir, '..', 'lib'),
+                     os.path.join(db_incdir, '..', '..', 'lib64'),
++                    os.path.join(db_incdir, '..', '..', 'libx32'),
+                     os.path.join(db_incdir, '..', '..', 'lib'),
+                 ]
+                 db_dirs_to_check = filter(os.path.isdir, db_dirs_to_check)
+--- bsddb3-6.1.0/setup3.py~	2014-07-21 12:46:55.000000000 +0200
++++ bsddb3-6.1.0/setup3.py	2015-10-02 22:34:44.585997136 +0200
+@@ -206,6 +206,7 @@
+ 
+             lib_dirs = compiler.library_dirs + [
+                 '/lib64', '/usr/lib64',
++                '/libx32', '/usr/libx32',
+                 '/lib', '/usr/lib',
+             ]
+             inc_dirs = compiler.include_dirs + ['/usr/include']
+@@ -250,8 +251,10 @@
+                 # check lib directories parallel to the location of the header
+                 db_dirs_to_check = [
+                     os.path.join(db_incdir, '..', 'lib64'),
++                    os.path.join(db_incdir, '..', 'libx32'),
+                     os.path.join(db_incdir, '..', 'lib'),
+                     os.path.join(db_incdir, '..', '..', 'lib64'),
++                    os.path.join(db_incdir, '..', '..', 'libx32'),
+                     os.path.join(db_incdir, '..', '..', 'lib'),
+                 ]
+                 db_dirs_to_check = list(filter(os.path.isdir, db_dirs_to_check))
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/python-bsddb.git/commitdiff/d300f666b0ac0c6e0ddd7244ff2f7968f0bc25f5