[arch-commits] Commit in python-numpy/trunk (ChangeLog PKGBUILD patch-lib64.patch)

[Jan de Groot]

    Date: Thursday, May 28, 2009 @ 15:05:07
  Author: jgc
Revision: 40191

upgpkg: python-numpy 1.3.0-2

Modified:
  python-numpy/trunk/ChangeLog
  python-numpy/trunk/PKGBUILD
Deleted:
  python-numpy/trunk/patch-lib64.patch

-------------------+
 ChangeLog         |    6 ++++++
 PKGBUILD          |   24 +++++++++++-------------
 patch-lib64.patch |    4 ----
 3 files changed, 17 insertions(+), 17 deletions(-)

Modified: ChangeLog
===================================================================
--- ChangeLog	2009-05-28 18:58:29 UTC (rev 40190)
+++ ChangeLog	2009-05-28 19:05:07 UTC (rev 40191)
@@ -1,3 +1,9 @@
+2009-05-28  Jan de Groot  <jgc at archlinux.org>
+
+	* Remove dependency on python-nose
+	* Force disable Atlas to avoid linking to it
+	* Remove patch, it does not apply and should not be needed
+
 2009-01-26  Angel 'angvp' Velasquez    <angvp at archlinux.com.ve>
 
 	* Added a patch to fix FS#12869

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-05-28 18:58:29 UTC (rev 40190)
+++ PKGBUILD	2009-05-28 19:05:07 UTC (rev 40191)
@@ -4,24 +4,22 @@
 
 pkgname=python-numpy
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64')
 license=('custom')
 url="http://numpy.scipy.org/"
-depends=('blas' 'python-nose' 'lapack')
-source=("http://downloads.sourceforge.net/numpy/numpy-$pkgver.tar.gz" patch-lib64.patch)
+depends=('blas' 'lapack')
+makedepends=('python-nose')
+optdepends=('python-nose: test suite')
+source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
+md5sums=('3f7773ff0971a5ebb8591536d8ec7bd6')
 
 build() {
-    cd "$srcdir/numpy-$pkgver"
+  cd "${srcdir}/numpy-${pkgver}"
+  export Atlas=None
+  python setup.py config_fc --fcompiler=gnu95 build || return 1
+  python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="${pkgdir}" || return 1
 
-    msg "patching system_info.py for compatibility with lib64"
-    patch numpy/distutils/system_info.py < $startdir/patch-lib64.patch # FS#12869
-
-    python setup.py config_fc --fcompiler=gnu95 build || return 1
-    python setup.py config_fc --fcompiler=gnu95 install --prefix=/usr --root="$pkgdir" || return 1
-
-    install -D -m644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  install -D -m644 LICENSE.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" || return 1
 }
-md5sums=('3f7773ff0971a5ebb8591536d8ec7bd6'
-         'fd9035cc359d43ca78c488738213b8fe')

Deleted: patch-lib64.patch
===================================================================
--- patch-lib64.patch	2009-05-28 18:58:29 UTC (rev 40190)
+++ patch-lib64.patch	2009-05-28 19:05:07 UTC (rev 40191)
@@ -1,4 +0,0 @@
-154c154
-<         default_x11_lib_dirs = ['/usr/lib64']
----
->         default_x11_lib_dirs = ['/usr/lib']