[arch-commits] Commit in python/repos (5 files)
Allan McRae
allan at archlinux.org
Sun Dec 7 06:59:30 UTC 2008
Date: Sunday, December 7, 2008 @ 01:59:29
Author: allan
Revision: 20903
Merged revisions 20444,20902 via svnmerge from
svn+ssh://archlinux.org/srv/svn-packages/python/trunk
........
r20444 | allan | 2008-12-04 15:03:11 +1000 (Thu, 04 Dec 2008) | 1 line
fix launchers for pynche and modulator
........
r20902 | allan | 2008-12-07 16:58:23 +1000 (Sun, 07 Dec 2008) | 4 lines
upgpkg: python 2.6-3
fix gdbm build issue
fix md5sum (FS#12360)
build with fixed modulator/pynche launchers
........
Added:
python/repos/extra-i686/python-2.6-gdbm.patch
(from rev 20902, python/trunk/python-2.6-gdbm.patch)
Modified:
python/repos/extra-i686/ (properties)
python/repos/extra-i686/PKGBUILD
python/repos/extra-i686/modulator-launcher
python/repos/extra-i686/pynche-launcher
-----------------------+
PKGBUILD | 14 ++++++++++----
modulator-launcher | 2 +-
pynche-launcher | 2 +-
python-2.6-gdbm.patch | 12 ++++++++++++
4 files changed, 24 insertions(+), 6 deletions(-)
Property changes on: python/repos/extra-i686
___________________________________________________________________
Modified: svnmerge-integrated
- /python/trunk:1-17263
+ /python/trunk:1-20902
Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2008-12-07 06:58:23 UTC (rev 20902)
+++ extra-i686/PKGBUILD 2008-12-07 06:59:29 UTC (rev 20903)
@@ -4,7 +4,7 @@
pkgname=python
pkgver=2.6
-pkgrel=2
+pkgrel=3
_pybasever=2.6
pkgdesc="A high-level scripting language"
arch=('i686' 'x86_64')
@@ -17,17 +17,21 @@
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
modulator-launcher
pynche-launcher)
-md5sums=('1b3c31fc54be2250ed18eb089b4d2779'
+md5sums=('837476958702cb386c657b5dba61cdc5'
'993800dbcc0c4f199c1ceee998a06e71'
- 'faa0d4b947bfe67fc8684b5c464f46f2'
- '60a44af1d8af276274e20c564c0f3d8b')
+ ''
+ 'b4a531570415280dc406c8d5c1fa8d83'
+ '9f731b9033db285132a3524fb36409e7')
+
build() {
cd ${srcdir}/Python-${pkgver}
patch -Np0 -i ${srcdir}/python-2.6-internal-expat.patch
+ patch -Np1 -i ${srcdir}/python-2.6-gdbm.patch
./configure --prefix=/usr --enable-shared --with-threads --enable-unicode
@@ -43,10 +47,12 @@
# Install the tools
#modulator
+ sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/modulator-launcher
install -m755 ${srcdir}/modulator-launcher ${pkgdir}/usr/bin/modulator
cp -r Tools/modulator ${pkgdir}/usr/lib/python${_pybasever}/site-packages/
#pynche
+ sed -i "s#%%PYBASEVER%%#${_pybasever}#" ${srcdir}/pynche-launcher
install -m755 ${srcdir}/pynche-launcher ${pkgdir}/usr/bin/pynche
rm -f Tools/pynche/*.pyw
cp -r Tools/pynche ${pkgdir}/usr/lib/python${_pybasever}/site-packages/
Modified: extra-i686/modulator-launcher
===================================================================
--- extra-i686/modulator-launcher 2008-12-07 06:58:23 UTC (rev 20902)
+++ extra-i686/modulator-launcher 2008-12-07 06:59:29 UTC (rev 20903)
@@ -1,2 +1,2 @@
#!/bin/bash
-exec /usr/lib/python2.5/site-packages/modulator/modulator.py
+exec /usr/lib/python%%PYBASEVER%%/site-packages/modulator/modulator.py
Modified: extra-i686/pynche-launcher
===================================================================
--- extra-i686/pynche-launcher 2008-12-07 06:58:23 UTC (rev 20902)
+++ extra-i686/pynche-launcher 2008-12-07 06:59:29 UTC (rev 20903)
@@ -1,3 +1,3 @@
#!/bin/bash
-/usr/lib/python2.5/site-packages/pynche/pynche
+/usr/lib/python%%PYBASEVER%%/site-packages/pynche/pynche
Copied: python/repos/extra-i686/python-2.6-gdbm.patch (from rev 20902, python/trunk/python-2.6-gdbm.patch)
===================================================================
--- extra-i686/python-2.6-gdbm.patch (rev 0)
+++ extra-i686/python-2.6-gdbm.patch 2008-12-07 06:59:29 UTC (rev 20903)
@@ -0,0 +1,12 @@
+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 ) )
More information about the arch-commits
mailing list