From c5a99e6c7477f7913f94c0209553ea1f7fff178208df07417e8e396872ca3af1 Mon Sep 17 00:00:00 2001 From: Denisart Benjamin Date: Sat, 6 Jul 2013 16:18:30 +0000 Subject: [PATCH] Accepting request 181955 from home:jengelh:db6 - Update to new upstream release 6.0.0 * Support for BDB 6.0.19 OBS-URL: https://build.opensuse.org/request/show/181955 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-bsddb3?expand=0&rev=24 --- bsddb3-5.3.0.tar.gz | 3 -- bsddb3-5.3.0.tar.gz.asc | 9 ----- bsddb3-6.0.0.tar.gz | 3 ++ bsddb3-6.0.0.tar.gz.asc | 9 +++++ bsddb3-db6.diff | 73 ----------------------------------------- python-bsddb3.changes | 9 +++++ python-bsddb3.spec | 6 ++-- 7 files changed, 24 insertions(+), 88 deletions(-) delete mode 100644 bsddb3-5.3.0.tar.gz delete mode 100644 bsddb3-5.3.0.tar.gz.asc create mode 100644 bsddb3-6.0.0.tar.gz create mode 100644 bsddb3-6.0.0.tar.gz.asc delete mode 100644 bsddb3-db6.diff diff --git a/bsddb3-5.3.0.tar.gz b/bsddb3-5.3.0.tar.gz deleted file mode 100644 index 402869d..0000000 --- a/bsddb3-5.3.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4619f6189e5f94e337c62ae398ccb9c25568f3c3cab39970a4ea7625d38f8b3e -size 385113 diff --git a/bsddb3-5.3.0.tar.gz.asc b/bsddb3-5.3.0.tar.gz.asc deleted file mode 100644 index d6ba32a..0000000 --- a/bsddb3-5.3.0.tar.gz.asc +++ /dev/null @@ -1,9 +0,0 @@ ------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----- diff --git a/bsddb3-6.0.0.tar.gz b/bsddb3-6.0.0.tar.gz new file mode 100644 index 0000000..ff66cd0 --- /dev/null +++ b/bsddb3-6.0.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:158fad482c42e0e3ace712ebf474a250fb221c06c570da578a1632b80fe3d84c +size 342086 diff --git a/bsddb3-6.0.0.tar.gz.asc b/bsddb3-6.0.0.tar.gz.asc new file mode 100644 index 0000000..aa8d6b0 --- /dev/null +++ b/bsddb3-6.0.0.tar.gz.asc @@ -0,0 +1,9 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1.4.13 (SunOS) + +iQCVAwUAUcRPKJlgi5GaxT1NAQKaEAQAmaJtNOPhe4ZluTbBbYvH4ooOzYI33yMs +D2/eeJsjLrJnhRxozm2cZH1ARMomo867+UZ8WR4DNLxayvPbi9h580MbnKHgQBi/ +DhRATXdF67zkYezrHWGCZHcbYIi6TZGDpjnp8b6axwCGG+lGdzImx+OeSCL7E9YK +6EBo/ThYMUg= +=dBOT +-----END PGP SIGNATURE----- diff --git a/bsddb3-db6.diff b/bsddb3-db6.diff deleted file mode 100644 index 925d1f1..0000000 --- a/bsddb3-db6.diff +++ /dev/null @@ -1,73 +0,0 @@ -From: Jan Engelhardt -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 diff --git a/python-bsddb3.changes b/python-bsddb3.changes index b8edc1e..a32fc18 100644 --- a/python-bsddb3.changes +++ b/python-bsddb3.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jun 22 17:16:27 UTC 2013 - jengelh@inai.de + +- Update to new upstream release 6.0.0 +* Support for BDB 6.0.19 +* HEADS UP: If you are using "bsddb3._bsddb" in your code, for + example for exceptions, change it to "bsddb3._db". +- Removed bsddb3-db6.diff (rendered obsolete) + ------------------------------------------------------------------- Sat Jun 15 23:24:15 UTC 2013 - jengelh@inai.de diff --git a/python-bsddb3.spec b/python-bsddb3.spec index 8d4e779..226a138 100644 --- a/python-bsddb3.spec +++ b/python-bsddb3.spec @@ -17,17 +17,18 @@ Name: python-bsddb3 -Version: 5.3.0 +Version: 6.0.0 Release: 0 Url: http://pypi.python.org/pypi/bsddb3 Summary: Python interface for Berkeley DB License: MIT Group: Development/Libraries/Python +#Freecode-URL: http://freecode.com/projects/bsddb3 +#Hg-Clone: http://hg.jcea.es/pybsddb/ 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 @@ -60,7 +61,6 @@ 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