[arch-commits] CVS update of extra/devel/python (2 files)

[andyrtr at archlinux.org]

    Date: Saturday, September 29, 2007 @ 07:37:50
  Author: andyrtr
    Path: /home/cvs-extra/extra/devel/python

   Added: db4.6-setup.py-detection.patch (1.1)
Modified: PKGBUILD (1.46 -> 1.47)

rebuild for new db


--------------------------------+
 PKGBUILD                       |   15 ++++++++-------
 db4.6-setup.py-detection.patch |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 7 deletions(-)


Index: extra/devel/python/PKGBUILD
diff -u extra/devel/python/PKGBUILD:1.46 extra/devel/python/PKGBUILD:1.47
--- extra/devel/python/PKGBUILD:1.46	Fri Apr 20 14:14:54 2007
+++ extra/devel/python/PKGBUILD	Sat Sep 29 07:37:50 2007
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD,v 1.46 2007/04/20 18:14:54 jason Exp $
+# $Id: PKGBUILD,v 1.47 2007/09/29 11:37:50 andyrtr Exp $
 # Maintainer: Jason Chu <jason at archlinux.org>
 pkgname=python
 pkgver=2.5.1
-pkgrel=1
+pkgrel=2
 _pybasever=2.5
 pkgdesc="A high-level scripting language"
 arch=(i686 x86_64)
 url="http://www.python.org"
-depends=('db>=4.5' 'bzip2' 'gdbm' 'openssl>=0.9.8d' 'zlib')
+depends=('db>=4.6' 'bzip2' 'gdbm' 'openssl>=0.9.8d' 'zlib')
 makedepends=('tk' 'sqlite3')
 provides=('python-ctypes')
 conflicts=('python-ctypes')
 replaces=('python-ctypes')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
-	Python-2.4.4-gdbm-1.patch)
+	Python-2.4.4-gdbm-1.patch
+	db4.6-setup.py-detection.patch)
 md5sums=('70084ffa561660f07de466c2c8c4842d'
-         '2b61e06365e9fb5f3af22d946efa8be6')
-sha1sums=('993a66bd2dabb0c4f33ca98372576315ef113df6'
-          '34c3973ba2e519eaf1fd0ecf28ec465ed08bb96d')
+         '2b61e06365e9fb5f3af22d946efa8be6'
+         '599fc8d1cb63a406d46e30c7e4b62a29')
 
 build() {
   cd ${startdir}/src/Python-${pkgver}
   patch -Np1 -i ${startdir}/src/Python-2.4.4-gdbm-1.patch || return 1
+  patch -Np0 -i ${startdir}/src/db4.6-setup.py-detection.patch || return 1
 
   ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
   # This is supposed to be the previous version's python directory
Index: extra/devel/python/db4.6-setup.py-detection.patch
diff -u /dev/null extra/devel/python/db4.6-setup.py-detection.patch:1.1
--- /dev/null	Sat Sep 29 07:37:50 2007
+++ extra/devel/python/db4.6-setup.py-detection.patch	Sat Sep 29 07:37:50 2007
@@ -0,0 +1,20 @@
+--- setup.py	2007-02-14 13:53:41.000000000 +0100
++++ setup.py.new	2007-09-29 13:31:04.000000000 +0200
+@@ -606,7 +606,7 @@
+         # a release.  Most open source OSes come with one or more
+         # versions of BerkeleyDB already installed.
+ 
+-        max_db_ver = (4, 5)
++        max_db_ver = (4, 6)
+         min_db_ver = (3, 3)
+         db_setup_debug = False   # verbose debug prints from this script?
+ 
+@@ -623,7 +623,7 @@
+             '/sw/include/db3',
+         ]
+         # 4.x minor number specific paths
+-        for x in (0,1,2,3,4,5):
++        for x in (0,1,2,3,4,5,6):
+             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)