[arch-commits] Commit in python/repos (3 files)

[andyrtr at archlinux.org]

    Date: Tuesday, July 8, 2008 @ 17:50:56
  Author: andyrtr
Revision: 4689

Merged revisions 4551-4688 via svnmerge from 
svn+ssh://svn.archlinux.org/home/svn-packages/python/trunk

........
  r4684 | andyrtr | 2008-07-08 21:18:58 +0000 (Di, 08 Jul 2008) | 1 line
  
  upgpkg: python 2.5.2-5
........

Modified:
  python/repos/testing-i686/	(properties)
  python/repos/testing-i686/PKGBUILD
Deleted:
  python/repos/testing-i686/db4.7-setup.py-detection.patch

--------------------------------+
 PKGBUILD                       |    7 ++-----
 db4.7-setup.py-detection.patch |   11 -----------
 2 files changed, 2 insertions(+), 16 deletions(-)


Property changes on: python/repos/testing-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /python/trunk:1-4550
   + /python/trunk:1-4688

Modified: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD	2008-07-08 21:47:25 UTC (rev 4688)
+++ testing-i686/PKGBUILD	2008-07-08 21:50:56 UTC (rev 4689)
@@ -4,13 +4,13 @@
 
 pkgname=python
 pkgver=2.5.2
-pkgrel=4
+pkgrel=5
 _pybasever=2.5
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org"
-depends=('db>=4.7' 'bzip2' 'gdbm' 'openssl>=0.9.8d' 'zlib')
+depends=('db4.5' 'bzip2' 'gdbm' 'openssl>=0.9.8d' 'zlib')
 makedepends=('tk>=8.5.0' 'sqlite3')
 provides=('python-elementree' 'python-ctypes')
 replaces=('python-elementree' 'python-ctypes')
@@ -19,7 +19,6 @@
 	modulator-launcher
 	pynche-launcher
 	Python-2.4.4-gdbm-1.patch
-	db4.7-setup.py-detection.patch
 	python-2.5.CVE-2007-4965-int-overflow.patch
 	python2.6-set_wakeup_fd4.patch
 	Python-2.5.2-idlelib.patch)
@@ -27,7 +26,6 @@
          'faa0d4b947bfe67fc8684b5c464f46f2'
          '60a44af1d8af276274e20c564c0f3d8b'
          '2b61e06365e9fb5f3af22d946efa8be6'
-         '176398feef253b7c01de2b4691a2719b'
          '491416c1b337fc61b6cdf5981d895a7d'
          'ec56710959deb01b5fa35829cafec6a3'
          'e6441e0b013ac64795221154e0495e10')
@@ -35,7 +33,6 @@
 build() {
   cd ${startdir}/src/Python-${pkgver}
   patch -Np1 -i ${srcdir}/Python-2.4.4-gdbm-1.patch || return 1
-  patch -Np0 -i ${srcdir}/db4.7-setup.py-detection.patch || return 1
   # fix http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2007-4965
   patch -Np1 -i ${srcdir}/python-2.5.CVE-2007-4965-int-overflow.patch || return 1
   

Deleted: testing-i686/db4.7-setup.py-detection.patch
===================================================================
--- testing-i686/db4.7-setup.py-detection.patch	2008-07-08 21:47:25 UTC (rev 4688)
+++ testing-i686/db4.7-setup.py-detection.patch	2008-07-08 21:50:56 UTC (rev 4689)
@@ -1,11 +0,0 @@
---- setup.py	2008-02-23 20:58:52.000000000 +0000
-+++ setup.py.new	2008-02-23 21:04:18.000000000 +0000
-@@ -608,7 +608,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, 7)
-         # NOTE: while the _bsddb.c code links against BerkeleyDB 4.6.x
-         # we leave that version disabled by default as it has proven to be
-         # quite a buggy library release on many platforms.