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

[Allan McRae]

    Date: Saturday, December 20, 2008 @ 08:57:03
  Author: allan
Revision: 22020

Merged revisions 22000 via svnmerge from 
svn+ssh://archlinux.org/srv/svn-packages/python24/trunk

........
  r22000 | allan | 2008-12-20 12:02:32 +0000 (Sat, 20 Dec 2008) | 4 lines
  
  upgpkg: python24 2.4.6-1
      upstream update
  remove bbad patch
  FHS man pages
........

Modified:
  python24/repos/extra-x86_64/	(properties)
  python24/repos/extra-x86_64/PKGBUILD
Deleted:
  python24/repos/extra-x86_64/db4.6-setup.py-detection.patch

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


Property changes on: python24/repos/extra-x86_64
___________________________________________________________________
Modified: svnmerge-integrated
   - /python24/trunk:1-4697
   + /python24/trunk:1-22019

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-12-20 13:34:25 UTC (rev 22019)
+++ extra-x86_64/PKGBUILD	2008-12-20 13:57:03 UTC (rev 22020)
@@ -1,10 +1,12 @@
 # $Id$
-# Maintainer: Jason Chu <jason at archlinux.org>
+# Maintainer: Allan McRae <allan at archlinux.org>
+# Contributor: Jason Chu <jason at archlinux.org>
+
 pkgname=python24
-pkgver=2.4.5
-pkgrel=3
+pkgver=2.4.6
+pkgrel=1
 pkgdesc="A high-level scripting language"
-arch=(i686 x86_64)
+arch=('i686' 'x86_64')
 license=('custom')
 url="http://www.python.org"
 depends=('db4.5' 'bzip2' 'gdbm' 'openssl' 'zlib' 'gcc-libs' 'readline')
@@ -12,32 +14,30 @@
 source=(http://www.python.org/ftp/python/$pkgver/Python-$pkgver.tar.bz2 
 	db4.5-setup.py-detection.patch db_fix.patch)
 options=('!makeflags')
-md5sums=('aade3958cb097cc1c69ae0074297d359'
+md5sums=('76083277f6c7e4d78992f36d7ad9018d'
          'f9620f756b43f46b28b2986de21285dc'
          '1c178479d17ae1e59cccb0a3f7be043b')
 
 build() {
   [ -e /usr/lib/libdb.so ] && echo "make sure you have no other db* pkg installed" && return 1
 
-  cd $startdir/src/Python-$pkgver
+  cd ${srcdir}/Python-${pkgver}
   patch -Np0 -i ../db4.5-setup.py-detection.patch || return 1
   patch -Np0 -i ../db_fix.patch || return 1
-  ./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
-  # This is supposed to be the previous version's python directory
-  #  NOT the current one
-  sed -i 's#SITEPATH=#SITEPATH=:../python2.3/site-packages#' Makefile
+  ./configure --prefix=/usr --mandir=/usr/share/man \
+              --enable-shared --with-threads --enable-unicode
   make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm $startdir/pkg/usr/bin/python
+  make DESTDIR=${pkgdir} install
+  rm ${pkgdir}/usr/bin/python
 
   # Rename all the scripts
-  pushd $startdir/pkg/usr/bin
+  pushd ${pkgdir}/usr/bin
   mv idle idle2.4
   mv pydoc pydoc2.4
   mv smtpd.py smtpd2.4.py
-  mv $startdir/pkg/usr/man/man1/python.1 $startdir/pkg/usr/man/man1/python${pkgver}
+  mv ${pkgdir}/usr/share/man/man1/python.1 ${pkgdir}/usr/share/man/man1/python${pkgver}
   popd
 
   # license
-  install -D -m644 LICENSE ${startdir}/pkg/usr/share/licenses/${pkgname}/LICENSE
+  install -D -m644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }

Deleted: extra-x86_64/db4.6-setup.py-detection.patch
===================================================================
--- extra-x86_64/db4.6-setup.py-detection.patch	2008-12-20 13:34:25 UTC (rev 22019)
+++ extra-x86_64/db4.6-setup.py-detection.patch	2008-12-20 13:57:03 UTC (rev 22020)
@@ -1,20 +0,0 @@
---- setup.py	2006-10-08 19:41:25.000000000 +0200
-+++ setup.py.new	2007-09-29 13:47:50.000000000 +0200
-@@ -522,7 +522,7 @@
-         #
-         # http://www.sleepycat.com/update/index.html
- 
--        max_db_ver = (4, 4)
-+        max_db_ver = (4, 6)
-         min_db_ver = (3, 2)
-         db_setup_debug = False   # verbose debug prints from this script?
- 
-@@ -539,7 +539,7 @@
-             '/sw/include/db3',
-         ]
-         # 4.x minor number specific paths
--        for x in (0,1,2,3,4):
-+        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)