python/python-bsddb3
SHA256
15
0
Fork 0
forked from pool/python-bsddb3
Code Pull Requests Activity

Accepting request 179744 from devel:languages:python

Browse Source 
housekeeping sr, necessary due to split between d:l:p and d:l:p3 and (manual) _link removal in Factory.

OBS-URL: https://build.opensuse.org/request/show/179744
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-bsddb3?expand=0&rev=18
This commit is contained in:
Stephan Kulow
2013-06-19 14:59:06 +00:00
committed by Git OBS Bridge
parent a4364403f2 ec8aeb6711
commit fd3a6255b6
7 changed files with 136 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python-bsddb3.changes
+6
View File
@@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Jun 15 23:24:15 UTC 2013 - jengelh@inai.de
- Add bsddb3-db6.diff to make setup[23].py look for BDB 6.0
- Signature verification
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 16 03:47:36 UTC 2013 - mlin@suse.com Wed Jan 16 03:47:36 UTC 2013 - mlin@suse.com
python3-bsddb3.changes
-10
View File
@@ -1,10 +0,0 @@
-------------------------------------------------------------------
Mon Jan 14 09:29:32 UTC 2013 - saschpe@suse.de
- Drop requires on "python(abi)", RPM does that automatically
-------------------------------------------------------------------
Fri Jan 11 14:41:40 UTC 2013 - p.drouand@gmail.com
- Initial python3 support
python-bsddb3.spec
+13 -4
View File
@@ -23,13 +23,20 @@ Url: http://pypi.python.org/pypi/bsddb3
Summary: Python interface for Berkeley DB Summary: Python interface for Berkeley DB
License: MIT License: MIT
Group: Development/Libraries/Python Group: Development/Libraries/Python
Source: http://pypi.python.org/packages/source/b/bsddb3/bsddb3-%{version}.tar.gz Source: http://pypi.python.org/packages/source/b/bsddb3/bsddb3-%{version}.tar.gz
Source2: http://pypi.python.org/packages/source/b/bsddb3/bsddb3-%{version}.tar.gz.asc
Source3: python-bsddb3.keyring
Patch1: bsddb3-db6.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: db-devel BuildRequires: db-devel
BuildRequires: python-devel BuildRequires: python-devel
%if 0%{?suse_version} && 0%{?suse_version} <= 1110 %if 0%{?suse_version} && 0%{?suse_version} <= 1110
%{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
%endif %endif
%if 0%{?suse_version} >= 1230
BuildRequires: gpg-offline
%endif
%description %description
This module provides a nearly complete wrapping of the Oracle/Sleepycat C API This module provides a nearly complete wrapping of the Oracle/Sleepycat C API
@@ -37,10 +44,6 @@ for the Database Environment, Database, Cursor, Log Cursor, Sequence and
Transaction objects, and each of these is exposed as a Python type in the Transaction objects, and each of these is exposed as a Python type in the
bsddb3.db module. bsddb3.db module.
%prep
%setup -q -n bsddb3-%{version}
sed -i "1d" Lib/bsddb/dbshelve.py # Fix non-executable bits
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
Group: Development/Libraries/Python Group: Development/Libraries/Python
@@ -54,6 +57,12 @@ bsddb3.db module.
This package contains the development files for %{name} This package contains the development files for %{name}
%prep
%{?gpg_verify: %gpg_verify %{S:2}}
%setup -q -n bsddb3-%{version}
%patch -P 1 -p1
sed -i "1d" Lib/bsddb/dbshelve.py # Fix non-executable bits
%build %build
CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build
python3-bsddb3.spec
-76
View File
@@ -1,76 +0,0 @@
#
# spec file for package python3-bsddb3
#
# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
# upon. The license for this file, and modifications and additions to the
# file, is the same license as for the pristine package itself (unless the
# license for the pristine package is not an Open Source License, in which
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
Name: python3-bsddb3
Version: 5.3.0
Release: 0
Url: http://pypi.python.org/pypi/bsddb3
Summary: Python interface for Berkeley DB
License: MIT
Group: Development/Libraries/Python
Source: http://pypi.python.org/packages/source/b/bsddb3/bsddb3-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: db-devel
BuildRequires: python3
BuildRequires: python3-devel
BuildRequires: python3-distribute
%description
This module provides a nearly complete wrapping of the Oracle/Sleepycat C API
for the Database Environment, Database, Cursor, Log Cursor, Sequence and
Transaction objects, and each of these is exposed as a Python type in the
bsddb3.db module.
%prep
%setup -q -n bsddb3-%{version}
sed -i "1d" Lib3/bsddb/dbshelve.py # Fix non-executable bits
%package devel
Summary: Development files for %{name}
Group: Development/Libraries/Python
Requires: %{name} = %{version}
%description devel
This module provides a nearly complete wrapping of the Oracle/Sleepycat C API
for the Database Environment, Database, Cursor, Log Cursor, Sequence and
Transaction objects, and each of these is exposed as a Python type in the
bsddb3.db module.
This package contains the development files for %{name}
%build
CFLAGS="%{optflags} -fno-strict-aliasing" python3 setup.py build
%install
python3 setup.py install --prefix=%{_prefix} --root=%{buildroot}
rm -rf %{buildroot}%{python3_sitearch}/bsddb3/tests # Remove wrongly packaged tests
# Disabled testsuite, takes quite some time to finish:
#%%check
#python test.py
%files
%defattr(-,root,root,-)
%doc ChangeLog TODO.txt docs/*
%{python3_sitearch}/*
%files devel
%defattr(-,root,root,-)
%{_includedir}/python*/bsddb3
%changelog
bsddb3-5.3.0.tar.gz.asc
+9
View File
@@ -0,0 +1,9 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.8 (SunOS)
iQCVAwUATxR/d5lgi5GaxT1NAQJ+UAP8DSWawG9Kl9DXzYytCGQ3j/T4UPoMbifV
YDxJ/nPVnSEJjFMtbQiRcTjBYn1AsnZkolAN1kC10AhaqJ0GEymLrYQtxXH3xDzR
xKp+ZCRQ4JawVBqWRkBP1xxp0Sy8uj+cUrnDveWu5/xBz6E0jq0X4xm+qsFjWsFb
tb41De6aH0E=
=UVcu
-----END PGP SIGNATURE-----
bsddb3-db6.diff
+73
View File
@@ -0,0 +1,73 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-06-16 01:28:54.291797887 +0200
Have bsddb3 support BDB 6.0.
---
Modules/_bsddb.c | 10 ++++++++++
setup2.py | 2 +-
setup3.py | 2 +-
3 files changed, 12 insertions(+), 2 deletions(-)
Index: bsddb3-5.3.0/Modules/_bsddb.c
===================================================================
--- bsddb3-5.3.0.orig/Modules/_bsddb.c
+++ bsddb3-5.3.0/Modules/_bsddb.c
@@ -2659,10 +2659,15 @@ _default_cmp(const DBT *leftKey,
return res;
}
+#if DB_VERSION_MAJOR >= 6
+static int _db_compareCallback(DB *db, const DBT *leftKey, const DBT *rightKey,
+ size_t *locp)
+#else
static int
_db_compareCallback(DB* db,
const DBT *leftKey,
const DBT *rightKey)
+#endif
{
int res = 0;
PyObject *args;
@@ -2773,10 +2778,15 @@ DB_set_bt_compare(DBObject* self, PyObje
RETURN_NONE();
}
+#if DB_VERSION_MAJOR >= 6
+static int _db_dupCompareCallback(DB *db, const DBT *leftKey,
+ const DBT *rightKey, size_t *locp)
+#else
static int
_db_dupCompareCallback(DB* db,
const DBT *leftKey,
const DBT *rightKey)
+#endif
{
int res = 0;
PyObject *args;
Index: bsddb3-5.3.0/setup2.py
===================================================================
--- bsddb3-5.3.0.orig/setup2.py
+++ bsddb3-5.3.0/setup2.py
@@ -128,7 +128,7 @@ if os.name == 'posix':
incdir = libdir = None
if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
# Supported Berkeley DB versions, in order of preference.
- db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
+ db_ver_list = ((6, 0), (5, 3), (5, 2), (5, 1), (5, 0),
(4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3))
# construct a list of paths to look for the header file in on
Index: bsddb3-5.3.0/setup3.py
===================================================================
--- bsddb3-5.3.0.orig/setup3.py
+++ bsddb3-5.3.0/setup3.py
@@ -128,7 +128,7 @@ if os.name == 'posix':
incdir = libdir = None
if not BERKELEYDB_DIR and not BERKELEYDB_LIBDIR and not BERKELEYDB_INCDIR:
# Supported Berkeley DB versions, in order of preference.
- db_ver_list = ((5, 3), (5, 2), (5, 1), (5, 0),
+ db_ver_list = ((6, 0), (5, 3), (5, 2), (5, 1), (5, 0),
(4, 8), (4, 7), (4, 6), (4, 5), (4, 4), (4, 3))
# construct a list of paths to look for the header file in on
python-bsddb3.keyring
+35
View File
@@ -0,0 +1,35 @@
pub 1024R/9AC53D4D 1995-01-01
uid Jesus Cea Avion <jcea@jcea.es>
uid [ opphevet] Jesus Cea Avion <jcea@argo.es>
uid [ opphevet] Jesus Cea Avion <jcea@uvigo.es>
uid [ opphevet] Jesus Cea Avion <jcea@ait.uvigo.es>
uid [ opphevet] Jesus Cea Avion <jcea@hispasec.com>
-----BEGIN PGP PUBLIC KEY BLOCK-----
Version: GnuPG v2.0.19 (GNU/Linux)
mI0DLwahUAAAAQQAp5FM6SwnOALpanzduURU210eo+cjgYGtSEyX44ndwweinGsW
f1zZFLpNT7yHyeTQ7x+la8ZWHGvxXZ59Tfu639IpzRlInid98xur/dxH0LyC3Y3h
b40RD1NZ2+93XjApgUnUtZkQ0B62fKCUvhYfsuLT5TVLAH4JmWCLkZrFPU0ABRG0
Hkplc3VzIENlYSBBdmlvbiA8amNlYUBhcmdvLmVzPokAlQMFMEuCtp+ZYIuRmsU9
TQEBci8D/0FfoDwfoBWjo33nQeJ1lwGdKn3UwAO0tvSxoT88s4DwpghxPRhRj364
clILown8h3KNGh2bAdZ6/AWj7/lE21QUCTVlS+BrFmySl7yObCuacqQ7IEYL2E03
Vm8Q+TmJvpEMwbLCUx8+mzX8xtn8VLzLuXfIizyMbDJYPbItU7qntB5KZXN1cyBD
ZWEgQXZpb24gPGpjZWFAamNlYS5lcz6JAJUDBRNICiQ+mWCLkZrFPU0BAcQ4BACO
nCIaSAO8XFPsHmv2U4yusut0lKitcEPGfyDXGY98qUY0aHI4LLmejOKd/Z2uwO61
DiXeCvyEMxRcj+cH2LGAF8EMG1nXpphWLSj/OvZ3qDoPZ/U2+xMNGPItOI8VsxlU
viCkSX1tcZZ+zlYMq6SyYyH9AnjhwP0xNQGyDLzDd7QfSmVzdXMgQ2VhIEF2aW9u
IDxqY2VhQHV2aWdvLmVzPokAlQMFMD6EdP6ZYIuRmsU9TQEBvxgEAJkobpbboriE
nVEV49DYzYFdFw9vRnnRnPd+LFmQ3qlEZSQDZH94u3r4VDCNLfvUFO/NIIxzzcxo
5FOl1gC8RtSZaH4I7/nlh8M3KswUBOoVRQaGbSuhKJcg/TZqlPns+WxcAczzhGiz
i+N370f0TTVmM1mQBk4Krf8qXxGhfU95tCNKZXN1cyBDZWEgQXZpb24gPGpjZWFA
YWl0LnV2aWdvLmVzPokAlQMFMD6EdQeZYIuRmsU9TQEBrVgD/1FlMoQRju/DHPrX
G6flPAdQD8d0RrU6xbiOCNpPprbYaq9TUhuCNqfbPfslETTOEySwobvdrcBypdxt
TVGdF1TZsNcpIxdtqJrAe5Hv1aL5Lfrk+0lGWkt0lzAESsAj1qRSH4TDHHMlnoXi
w+5sKWtNd4PFQ8NEhjpbNBUm8t4MtCNKZXN1cyBDZWEgQXZpb24gPGpjZWFAaGlz
cGFzZWMuY29tPokAlQMFMFFQSbGZYIuRmsU9TQEBOhIEAKYzsqjav+Szz5bRQ6ks
nNkku4Pt+CNDwRukk9ivmUUBUAm5HRc4WvORODeApFyc1cdgiHiXBP0MGCV2P7Kh
KsONVeNRzmEzrmWYjR88MgMxOi6HdvP9b32gUSyXfweADUoJLcQ+iVJg+7pfn6sL
EwygHNmncOK4QPS/uyNv8Xqs
=m8T0
-----END PGP PUBLIC KEY BLOCK-----