[arch-commits] Commit in python2/trunk (PKGBUILD)

[Stéphane Gaudreault]

    Date: Saturday, April 14, 2012 @ 19:21:49
  Author: stephane
Revision: 156163

upgpkg: python2 2.7.3-1

Modified:
  python2/trunk/PKGBUILD

----------+
 PKGBUILD |   27 +++++----------------------
 1 file changed, 5 insertions(+), 22 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-04-14 22:02:29 UTC (rev 156162)
+++ PKGBUILD	2012-04-14 23:21:49 UTC (rev 156163)
@@ -4,8 +4,8 @@
 # Contributer: Jason Chu <jason at archlinux.org>
 
 pkgname=python2
-pkgver=2.7.2
-pkgrel=6
+pkgver=2.7.3
+pkgrel=1
 _pybasever=2.7
 pkgdesc="A high-level scripting language"
 arch=('i686' 'x86_64')
@@ -16,14 +16,8 @@
 optdepends=('tk: for IDLE')
 conflicts=('python<3')
 options=('!makeflags')
-source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz
-        linux2.patch
-        gdbm-magic-values.patch
-        13156-revert-tls-changeset-subinterpreter.patch)
-sha1sums=('56700044141402dc35e7a0a24aa7ffda1a8c1a53'
-          '937c06190899a491d662c7918658313e7640070e'
-          'ede2c991b1a91eec5a01cc2d3a11231f17d750ae'
-          'd61fa2b8efd1d08a2ee8a9aed434dc94b8297d6b')
+source=(http://www.python.org/ftp/python/${pkgver%rc?}/Python-${pkgver}.tar.xz)
+sha1sums=('b2b0ada7ebed4a8204a855193afbdb3aa3308357')
 
 build() {
   cd "${srcdir}/Python-${pkgver}"
@@ -38,17 +32,6 @@
   # FS#23997
   sed -i -e "s|^#.* /usr/local/bin/python|#!/usr/bin/python2|" Lib/cgi.py
 
-  # Make sure sys.platform is set to linux2, even on kernel 3.X
-  # cf http://bugs.python.org/issue12326
-  patch -Np1 -i ../linux2.patch
-
-  # gdbm has new magic that whichdb does not recognize
-  # http://bugs.python.org/issue13007
-  patch -Np1 -i ../gdbm-magic-values.patch
-
-  # http://bugs.python.org/issue13156
-  patch -Np1 -i ../13156-revert-tls-changeset-subinterpreter.patch
-
   # Ensure that we are using the system copy of various libraries (expat, zlib and libffi),
   # rather than copies shipped in the tarball
   rm -r Modules/expat
@@ -60,7 +43,7 @@
               --enable-unicode=ucs4 --with-system-expat --with-system-ffi \
               --with-dbmliborder=gdbm:ndbm
 
-  make MACHDEP=linux2
+  make
 }
 
 package() {