Hello community, here is the log from the commit of package python-bsddb3 for openSUSE:Factory checked in at 2013-06-19 16:59:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/python-bsddb3 (Old) and /work/SRC/openSUSE:Factory/.python-bsddb3.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-bsddb3" Changes: -------- --- /work/SRC/openSUSE:Factory/python-bsddb3/python-bsddb3.changes 2013-01-17 09:57:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.python-bsddb3.new/python-bsddb3.changes 2013-06-19 16:59:07.000000000 +0200 @@ -1,0 +2,6 @@ +Sat Jun 15 23:24:15 UTC 2013 - [email protected] + +- Add bsddb3-db6.diff to make setup[23].py look for BDB 6.0 +- Signature verification + +------------------------------------------------------------------- Old: ---- python3-bsddb3.changes python3-bsddb3.spec New: ---- bsddb3-5.3.0.tar.gz.asc bsddb3-db6.diff python-bsddb3.keyring ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ python-bsddb3.spec ++++++ --- /var/tmp/diff_new_pack.hFVxZH/_old 2013-06-19 16:59:07.000000000 +0200 +++ /var/tmp/diff_new_pack.hFVxZH/_new 2013-06-19 16:59:07.000000000 +0200 @@ -23,13 +23,20 @@ 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 +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 BuildRequires: db-devel BuildRequires: python-devel %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()")} %endif +%if 0%{?suse_version} >= 1230 +BuildRequires: gpg-offline +%endif %description This module provides a nearly complete wrapping of the Oracle/Sleepycat C API @@ -37,10 +44,6 @@ 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" Lib/bsddb/dbshelve.py # Fix non-executable bits - %package devel Summary: Development files for %{name} Group: Development/Libraries/Python @@ -54,6 +57,12 @@ 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 CFLAGS="%{optflags} -fno-strict-aliasing" python setup.py build ++++++ bsddb3-db6.diff ++++++ From: Jan Engelhardt <[email protected]> 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 ++++++ pub 1024R/9AC53D4D 1995-01-01 uid Jesus Cea Avion <[email protected]> uid [ opphevet] Jesus Cea Avion <[email protected]> uid [ opphevet] Jesus Cea Avion <[email protected]> uid [ opphevet] Jesus Cea Avion <[email protected]> uid [ opphevet] Jesus Cea Avion <[email protected]> -----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----- -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
