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

[Allan McRae]

    Date: Tuesday, March 23, 2010 @ 00:52:34
  Author: allan
Revision: 73144

upgpkg: python 2.6.5-2
fix dbm module, remove unneeded patches

Modified:
  python/trunk/PKGBUILD
Deleted:
  python/trunk/python-2.6-gdbm.patch
  python/trunk/python-2.6-readline.patch

---------------------------+
 PKGBUILD                  |    8 +-------
 python-2.6-gdbm.patch     |   12 ------------
 python-2.6-readline.patch |   23 -----------------------
 3 files changed, 1 insertion(+), 42 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-03-23 04:35:55 UTC (rev 73143)
+++ PKGBUILD	2010-03-23 04:52:34 UTC (rev 73144)
@@ -4,7 +4,7 @@
 
 pkgname=python
 pkgver=2.6.5
-pkgrel=1
+pkgrel=2
 _pybasever=2.6
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -17,15 +17,11 @@
 replaces=('python-elementtree' 'python-ctypes')
 source=(http://www.python.org/ftp/python/${pkgver}/Python-${pkgver}.tar.bz2
 	python-2.6-internal-expat.patch
-	python-2.6-gdbm.patch
-	python-2.6-readline.patch
 	python-2.6-db-4.8.patch
 	modulator-launcher
 	pynche-launcher)
 md5sums=('6bef0417e71a1a1737ccf5750420fdb3'
          '993800dbcc0c4f199c1ceee998a06e71'
-         '13fab4bb2cacbc433e62d7191a17f71e'
-         '1f0aed8b96d4531f40fd3e24a80157a5'
          '10eb5449ead95b9cb13eae9f9a65894e'
          'b4a531570415280dc406c8d5c1fa8d83'
          '9f731b9033db285132a3524fb36409e7')
@@ -34,8 +30,6 @@
   cd ${srcdir}/Python-${pkgver}
 
   patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch
-  patch -Np1 -i ${srcdir}/python-2.6-gdbm.patch
-  patch -Np0 -i ${srcdir}/python-2.6-readline.patch
 
   #http://bugs.python.org/issue6949
   patch -Np0 -i ${srcdir}/python-2.6-db-4.8.patch

Deleted: python-2.6-gdbm.patch
===================================================================
--- python-2.6-gdbm.patch	2010-03-23 04:35:55 UTC (rev 73143)
+++ python-2.6-gdbm.patch	2010-03-23 04:52:34 UTC (rev 73144)
@@ -1,12 +0,0 @@
-diff -Naur Python-2.6-old/setup.py Python-2.6/setup.py
---- Python-2.6-old/setup.py	2008-09-30 10:15:45.000000000 +1000
-+++ Python-2.6/setup.py	2008-12-07 16:04:01.000000000 +1000
-@@ -1013,7 +1013,7 @@
-                 if self.compiler.find_library_file(lib_dirs, 'ndbm'):
-                     ndbm_libs = ['ndbm']
-                 else:
--                    ndbm_libs = []
-+                    ndbm_libs = ['gdbm', 'gdbm_compat']
-                 exts.append( Extension('dbm', ['dbmmodule.c'],
-                                        define_macros=[('HAVE_NDBM_H',None)],
-                                        libraries = ndbm_libs ) )

Deleted: python-2.6-readline.patch
===================================================================
--- python-2.6-readline.patch	2010-03-23 04:35:55 UTC (rev 73143)
+++ python-2.6-readline.patch	2010-03-23 04:52:34 UTC (rev 73144)
@@ -1,23 +0,0 @@
---- Modules/readline.c	2008-11-04 12:43:31.000000000 -0800
-+++ Modules/readline.c	2009-04-22 15:50:49.000000000 -0700
-@@ -759,6 +759,10 @@
- static char **
- flex_complete(char *text, int start, int end)
- {
-+#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
-+	rl_completion_append_character ='\0';
-+	rl_completion_suppress_append = 0;
-+#endif
- 	Py_XDECREF(begidx);
- 	Py_XDECREF(endidx);
- 	begidx = PyInt_FromLong((long) start);
-@@ -799,11 +803,8 @@
- 	rl_completer_word_break_characters =
-		strdup(" \t\n`~!@#$%^&*()-=+[{]}\\|;:'\",<>/?");
- 		/* All nonalphanums except '.' */
--#ifdef HAVE_RL_COMPLETION_APPEND_CHARACTER
--	rl_completion_append_character ='\0';
--#endif
- 
- 	begidx = PyInt_FromLong(0L);
- 	endidx = PyInt_FromLong(0L);