diff --git a/Python-2.5-db45.patch b/Python-2.5-db45.patch new file mode 100644 index 0000000..1bc4370 --- /dev/null +++ b/Python-2.5-db45.patch @@ -0,0 +1,78 @@ +--- Modules/_bsddb.c ++++ Modules/_bsddb.c +@@ -4129,6 +4129,8 @@ + } + + ++#if (DBVER < 45) ++ + static PyObject* + DBEnv_set_lk_max(DBEnvObject* self, PyObject* args) + { +@@ -4145,6 +4147,7 @@ + RETURN_NONE(); + } + ++#endif + + #if (DBVER >= 32) + +@@ -5233,7 +5236,9 @@ + {"set_lg_regionmax",(PyCFunction)DBEnv_set_lg_regionmax, METH_VARARGS}, + #endif + {"set_lk_detect", (PyCFunction)DBEnv_set_lk_detect, METH_VARARGS}, ++#if (DBVER < 45) + {"set_lk_max", (PyCFunction)DBEnv_set_lk_max, METH_VARARGS}, ++#endif + #if (DBVER >= 32) + {"set_lk_max_locks", (PyCFunction)DBEnv_set_lk_max_locks, METH_VARARGS}, + {"set_lk_max_lockers", (PyCFunction)DBEnv_set_lk_max_lockers, METH_VARARGS}, +@@ -5835,7 +5840,9 @@ + ADD_INT(d, DB_AFTER); + ADD_INT(d, DB_APPEND); + ADD_INT(d, DB_BEFORE); ++#if (DBVER < 45) + ADD_INT(d, DB_CACHED_COUNTS); ++#endif + #if (DBVER >= 41) + _addIntToDict(d, "DB_CHECKPOINT", 0); + #else +@@ -5870,7 +5877,9 @@ + ADD_INT(d, DB_POSITION); + ADD_INT(d, DB_PREV); + ADD_INT(d, DB_PREV_NODUP); ++#if (DBVER < 45) + ADD_INT(d, DB_RECORDCOUNT); ++#endif + ADD_INT(d, DB_SET); + ADD_INT(d, DB_SET_RANGE); + ADD_INT(d, DB_SET_RECNO); +--- setup.py ++++ setup.py +@@ -609,7 +609,7 @@ + # a release. Most open source OSes come with one or more + # versions of BerkeleyDB already installed. + +- max_db_ver = (4, 4) ++ max_db_ver = (4, 5) + min_db_ver = (3, 3) + db_setup_debug = False # verbose debug prints from this script? + +@@ -626,7 +626,7 @@ + '/sw/include/db3', + ] + # 4.x minor number specific paths +- for x in (0,1,2,3,4): ++ for x in (0,1,2,3,4,5): + db_inc_paths.append('/usr/include/db4%d' % x) + db_inc_paths.append('/usr/include/db4.%d' % x) + db_inc_paths.append('/usr/local/BerkeleyDB.4.%d/include' % x) +@@ -649,7 +649,7 @@ + for dn in inc_dirs: + std_variants.append(os.path.join(dn, 'db3')) + std_variants.append(os.path.join(dn, 'db4')) +- for x in (0,1,2,3,4): ++ for x in (0,1,2,3,4,5): + std_variants.append(os.path.join(dn, "db4%d"%x)) + std_variants.append(os.path.join(dn, "db4.%d"%x)) + for x in (2,3): diff --git a/python-doc.spec b/python-doc.spec index 5618e9c..65c7cf1 100644 --- a/python-doc.spec +++ b/python-doc.spec @@ -12,12 +12,12 @@ Name: python-doc URL: http://www.python.org/ -License: Other License(s), see package +License: Python Copyright Group: Development/Languages/Python BuildRoot: %{_tmppath}/%{name}-%{version}-build Summary: Additional Package Documentation for Python. Version: 2.5 -Release: 29 +Release: 38 %define pyver %{version} BuildArch: noarch %define tarname Python-%{pyver} diff --git a/python.changes b/python.changes index 9a953ce..0e9e172 100644 --- a/python.changes +++ b/python.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue May 22 01:13:28 CEST 2007 - ro@suse.de + +- make setup.py accept db-4.5 + ------------------------------------------------------------------- Thu Mar 29 13:32:08 CEST 2007 - aj@suse.de diff --git a/python.spec b/python.spec index 35ac2e8..28060b7 100644 --- a/python.spec +++ b/python.spec @@ -19,7 +19,7 @@ Autoreqprov: on Obsoletes: python-nothreads python21 Summary: Python Interpreter Version: 2.5 -Release: 38 +Release: 50 %define tarname Python-%{version} Source0: %{tarname}.tar.bz2 Source6: README.SUSE @@ -39,6 +39,7 @@ Patch23: ssl-compat.diff Patch25: python-2.4.2-canonicalize2.patch Patch26: python-2.4-localpath.patch Patch27: python-2.5c1-dirs-fix.patch +Patch28: Python-2.5-db45.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %define python_version %(echo %{version} | head -c 3) %define idle_name idle @@ -199,6 +200,7 @@ Python2.x, it is part of the core Python distribution. %patch25 %patch26 %patch27 +%patch28 # some cleanup find . -name .cvsignore -type f -print0 | xargs -0 rm -f find . -name CVS -type d -print0 | xargs -0 rm -rf @@ -476,6 +478,8 @@ rm -rf $RPM_BUILD_ROOT %attr(755, root, root) %{_bindir}/smtpd.py %changelog +* Tue May 22 2007 - ro@suse.de +- make setup.py accept db-4.5 * Thu Mar 29 2007 - aj@suse.de - Add ncurses-devel to BuildRequires. * Sat Mar 24 2007 - aj@suse.de