packages: python/python.spec, python/python-db.patch - readded updated db p...

[qboosh]

Author: qboosh                       Date: Tue Jul 13 20:11:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- readded updated db patch (db 5.0 support)

---- Files affected:
packages/python:
   python.spec (1.377 -> 1.378) , python-db.patch (1.7 -> 1.8) 

---- Diffs:

================================================================
Index: packages/python/python.spec
diff -u packages/python/python.spec:1.377 packages/python/python.spec:1.378
--- packages/python/python.spec:1.377	Mon Jul 12 08:45:18 2010
+++ packages/python/python.spec	Tue Jul 13 22:11:00 2010
@@ -52,7 +52,8 @@
 # Source0-md5:	0e8c9ec32abf5b732bea7d91b38c3339
 Source1:	http://www.python.org/ftp/python/doc/%{dver}/%{name}-%{dver}-docs-html.tar.bz2
 # Source1-md5:	16b736789e923bbefe74e7a2219031c6
-Patch1:		%{name}-%{name}path.patch
+Patch0:		%{name}-db.patch
+Patch1:		%{name}-pythonpath.patch
 Patch2:		%{name}-ac_fixes.patch
 Patch3:		%{name}-lib64.patch
 Patch4:		%{name}-noarch_to_datadir.patch
@@ -545,6 +546,7 @@
 
 %prep
 %setup -q -n Python-%{version}%{beta}
+%patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
@@ -1022,6 +1024,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.378  2010/07/13 20:11:00  qboosh
+- readded updated db patch (db 5.0 support)
+
 Revision 1.377  2010/07/12 06:45:18  qboosh
 - test_zlib no longer fails
 

================================================================
Index: packages/python/python-db.patch
diff -u /dev/null packages/python/python-db.patch:1.8
--- /dev/null	Tue Jul 13 22:11:05 2010
+++ packages/python/python-db.patch	Tue Jul 13 22:11:00 2010
@@ -0,0 +1,39 @@
+--- Python-2.7/setup.py.orig	2010-07-11 20:29:09.142656610 +0200
++++ Python-2.7/setup.py	2010-07-12 08:43:42.578657448 +0200
+@@ -765,7 +765,7 @@
+         # a release.  Most open source OSes come with one or more
+         # versions of BerkeleyDB already installed.
+ 
+-        max_db_ver = (4, 8)
++        max_db_ver = (5, 0)
+         min_db_ver = (4, 1)
+         db_setup_debug = True   # verbose debug prints from this script?
+ 
+@@ -787,8 +787,12 @@
+             return True
+ 
+         def gen_db_minor_ver_nums(major):
+-            if major == 4:
++            if major == 5:
+                 for x in range(max_db_ver[1]+1):
++		    if allow_db_ver((5, x)):
++                        yield x
++            elif major == 4:
++                for x in range(0, 9):
+                     if allow_db_ver((4, x)):
+                         yield x
+             elif major == 3:
+--- Python-2.7/Modules/_bsddb.c.orig	2010-05-09 16:46:46.000000000 +0200
++++ Python-2.7/Modules/_bsddb.c	2010-07-13 19:30:54.530654934 +0200
+@@ -9765,8 +9765,10 @@
+ 
+     ADD_INT(d, DB_REP_PERMANENT);
+ 
+-#if (DBVER >= 44)
++#if (DBVER >= 44) && (DBVER < 50)
+     ADD_INT(d, DB_REP_CONF_NOAUTOINIT);
++#endif
++#if (DBVER >= 44)
+     ADD_INT(d, DB_REP_CONF_DELAYCLIENT);
+     ADD_INT(d, DB_REP_CONF_BULK);
+     ADD_INT(d, DB_REP_CONF_NOWAIT);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python.spec?r1=1.377&r2=1.378&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/python/python-db.patch?r1=1.7&r2=1.8&f=u