Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv7843
Modified Files:
numpy-py.info
Added Files:
numpy-py.patch
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
--- NEW FILE: numpy-py.patch ---
--- numpy-1.6.0/numpy/distutils/system_info.py.orig 2011-07-23
10:10:06.000000000 -0400
+++ numpy-1.6.0/numpy/distutils/system_info.py 2011-07-23 10:10:53.000000000
-0400
@@ -1287,7 +1287,7 @@
if sys.platform=='darwin' and not os.environ.get('ATLAS',None):
args = []
link_args = []
- if get_platform()[-4:] == 'i386':
+ if get_platform().rsplit('-', 1)[1] in ('i386', 'x86_64', 'intel'):
intel = 1
else:
intel = 0
@@ -1374,7 +1374,7 @@
if sys.platform=='darwin' and not os.environ.get('ATLAS',None):
args = []
link_args = []
- if get_platform()[-4:] == 'i386':
+ if get_platform().rsplit('-', 1)[1] in ('i386', 'x86_64',
'intel'):
intel = 1
else:
intel = 0
Index: numpy-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/numpy-py.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- numpy-py.info 11 Jul 2011 04:08:34 -0000 1.1
+++ numpy-py.info 5 Nov 2011 23:40:56 -0000 1.2
@@ -1,14 +1,16 @@
Info2: <<
Package: numpy-py%type_pkg[python]
-Version: 1.5.1
-Revision: 1
+Version: 1.6.1
+Revision: 2
Distribution: (%type_pkg[python] = 23) 10.4, (%type_pkg[python] = 24) 10.4,
(%type_pkg[python] = 24) 10.5
Maintainer: Sebastien Maret <bma...@users.sourceforge.net>
Type: python (2.4 2.5 2.6 2.7)
Depends: python%type_pkg[python], nose-py%type_pkg[python]
BuildDepends: fink (>= 0.24.12)
Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
-Source-MD5: 376ef150df41b5353944ab742145352d
+Source-MD5: 2bce18c08fc4fce461656f0f4dd9103e
+PatchFile: numpy-py.patch
+PatchFile-MD5: 7eefeed37202512153e6dee2fa3f4d50
Conflicts: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4)
Replaces: f2py-py%type_pkg[python], scipy-py%type_pkg[python] (<= 1:0.4),
scipy-core-py%type_pkg[python] (<< 1.3.0-6)
Provides: f2py-py%type_pkg[python]
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
