Update of /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv23433
Modified Files:
scipy-py.info scipy-core-py.info scipy-core-py.patch
Log Message:
New upstream version.
Index: scipy-core-py.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/scipy-core-py.patch,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scipy-core-py.patch 6 Apr 2006 22:50:39 -0000 1.6
+++ scipy-core-py.patch 9 Jun 2006 12:02:40 -0000 1.7
@@ -1,119 +1,3 @@
---- numpy/numpy/distutils/fcompiler/gnu.py.orig 2006-01-23
06:25:07.000000000 -0700
-+++ numpy/numpy/distutils/fcompiler/gnu.py 2006-01-23 06:21:38.000000000
-0700
-@@ -29,7 +29,8 @@
- 'compiler_f77' : [fc_exe,"-Wall","-fno-second-underscore"],
- 'compiler_f90' : None,
- 'compiler_fix' : None,
-- 'linker_so' : [fc_exe,"-Wall"],
-+# 'linker_so' : [fc_exe,"-Wall"],
-+ 'linker_so' : [fc_exe+" -undefined dynamic_lookup -bundle"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : ["ranlib"],
- 'linker_exe' : [fc_exe,"-Wall"]
-@@ -64,7 +65,7 @@
- os.environ['MACOSX_DEPLOYMENT_TARGET'] = '%s.%s' % (major,
- minor)
-
-- opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
-+ #opt.extend(['-undefined', 'dynamic_lookup', '-bundle'])
- else:
- opt.append("-shared")
- if sys.platform[:5]=='sunos':
-@@ -108,7 +109,11 @@
- if g2c is not None:
- opt.append(g2c)
- if sys.platform == 'darwin':
-- opt.append('cc_dynamic')
-+ #opt.append('cc_dynamic')
-+ import platform
-+ opt = []
-+ if platform.mac_ver()[0] < 10.4:
-+ opt.append('cc_dynamic')
- return opt
-
- def get_flags_debug(self):
-@@ -211,7 +216,8 @@
- class Gnu95FCompiler(GnuFCompiler):
-
- compiler_type = 'gnu95'
-- version_pattern = r'GNU Fortran 95 \(GCC (?P<version>[^\s*\)]+)'
-+ version_pattern = r'GNU Fortran 95 ((\(GCC[^\)]*(\)\)|\)))|)\s*'\
-+ '(?P<version>[^\s*\)]+)'
-
- # 'gfortran --version' results:
- # Debian: GNU Fortran 95 (GCC 4.0.3 20051023 (prerelease) (Debian
4.0.2-3))
-@@ -224,7 +230,8 @@
- 'compiler_f77' :
[fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
- 'compiler_f90' : [fc_exe,"-Wall","-fno-second-underscore"],
- 'compiler_fix' :
[fc_exe,"-Wall","-ffixed-form","-fno-second-underscore"],
-- 'linker_so' : [fc_exe,"-Wall"],
-+ #'linker_so' : [fc_exe,"-Wall"],
-+ 'linker_so' : [fc_exe+" -undefined dynamic_lookup -bundle"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : ["ranlib"],
- 'linker_exe' : [fc_exe,"-Wall"]
---- numpy/numpy/distutils/fcompiler/ibm.py.orig 2006-01-23
06:27:47.000000000 -0700
-+++ numpy/numpy/distutils/fcompiler/ibm.py 2006-01-23 06:22:55.000000000
-0700
-@@ -4,18 +4,30 @@
-
- from numpy.distutils.fcompiler import FCompiler
- from distutils import log
-+from numpy.distutils.exec_command import exec_command, find_executable
-
- class IbmFCompiler(FCompiler):
-
- compiler_type = 'ibm'
- version_pattern = r'xlf\(1\)\s*IBM XL Fortran (Advanced Edition
|)Version (?P<version>[^\s*]*)'
-
-+ for fc_exe in map(find_executable,['xlf']):
-+ if os.path.isfile(fc_exe):
-+ break
-+ for f90_exe in map(find_executable,['xlf90']):
-+ if os.path.isfile(f90_exe):
-+ break
-+ for f95_exe in map(find_executable,['xlf95']):
-+ if os.path.isfile(f95_exe):
-+ break
-+
- executables = {
-- 'version_cmd' : ["xlf"],
-- 'compiler_f77' : ["xlf"],
-- 'compiler_fix' : ["xlf90", "-qfixed"],
-- 'compiler_f90' : ["xlf90"],
-- 'linker_so' : ["xlf95"],
-+ 'version_cmd' : [fc_exe],
-+ 'compiler_f77' : [fc_exe],
-+ 'compiler_fix' : [f90_exe+" -qfixed"],
-+ 'compiler_f90' : [f90_exe],
-+ #'linker_so' : ["xlf95"],
-+ 'linker_so' : [f95_exe+" -undefined dynamic_lookup -bundle"],
- 'archiver' : ["ar", "-cr"],
- 'ranlib' : ["ranlib"]
- }
-@@ -31,9 +43,9 @@
- l.sort()
- l.reverse()
- l = [d for d in l if
os.path.isfile(os.path.join(xlf_dir,d,'xlf.cfg'))]
-- if not l:
-- from distutils.version import LooseVersion
-- self.version = version = LooseVersion(l[0])
-+ #if not l:
-+ from distutils.version import LooseVersion
-+ self.version = version = LooseVersion(l[0])
- return version
-
- def get_flags(self):
-@@ -45,7 +57,8 @@
- def get_flags_linker_so(self):
- opt = []
- if sys.platform=='darwin':
-- opt.append('-Wl,-bundle,-flat_namespace,-undefined,suppress')
-+ #opt.append('-Wl,-bundle,-flat_namespace,-undefined,suppress')
-+ pass
- else:
- opt.append('-bshared')
- version = self.get_version(ok_status=[0,40])
-
--- numpy/numpy/distutils/fcompiler/g95.py 2006-03-29 12:07:42.000000000
-0700
+++ numpy/numpy/distutils/fcompiler/g95.py.orig 2006-03-29
12:04:01.000000000 -0700
@@ -9,14 +9,16 @@
Index: scipy-py.info
===================================================================
RCS file: /cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/scipy-py.info,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- scipy-py.info 14 Apr 2006 12:34:56 -0000 1.10
+++ scipy-py.info 9 Jun 2006 12:02:39 -0000 1.11
@@ -1,15 +1,15 @@
Info2: <<
Package: scipy-py%type_pkg[python]
-Version: 0.4.8
+Version: 0.4.9
Epoch: 1
-Revision: 2
+Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Type: python (2.3 2.4)
-Depends: scipy-core-py%type_pkg[python] (>= 0.9.6), python%type_pkg[python] |
python%type_pkg[python]-nox, fftw3-shlibs
+Depends: scipy-core-py%type_pkg[python] (>= 0.9.8), python%type_pkg[python] |
python%type_pkg[python]-nox, fftw3-shlibs
BuildDepends: fftw3, g95 (>= 0.50-20060413)
Source: mirror:sourceforge:scipy/scipy-%v.tar.gz
-Source-MD5: 854db037c56a0a359f877e8f852925ea
+Source-MD5: bb1db6e0b60652ef26f92587c853a15f
CompileScript: <<
%p/bin/python%type_raw[python] setup.py config_fc --fcompiler=g95 build
<<
Index: scipy-core-py.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.3/unstable/main/finkinfo/sci/scipy-core-py.info,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- scipy-core-py.info 6 Apr 2006 22:50:39 -0000 1.9
+++ scipy-core-py.info 9 Jun 2006 12:02:40 -0000 1.10
@@ -1,17 +1,17 @@
Info2: <<
Package: scipy-core-py%type_pkg[python]
-Version: 0.9.6
+Version: 0.9.8
Revision: 1
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Type: python (2.3 2.4)
Depends: python%type_pkg[python] | python%type_pkg[python]-nox
Source: mirror:sourceforge:numpy/numpy-%v.tar.gz
-Source-MD5: eac9ae05bd7511cecf1ffd12da0e1993
+Source-MD5: ca528d2b460a6567d70bb6bdf0dc1805
+Patch: %{ni}.patch
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)
Provides: numpy-py%type_pkg[python], f2py-py%type_pkg[python]
-Patch: %{ni}.patch
CompileScript: <<
%p/bin/python%type_raw[python] setup.py build
<<
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
