Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory 
sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv32094/10.4-public/unstable/main/finkinfo/sci

Modified Files:
        scientificpython-py.info scientificpython-py.patch 
Log Message:
self-consistent use of libnc's netcdf


Index: scientificpython-py.patch
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scientificpython-py.patch   21 Jun 2008 17:27:44 -0000      1.3
+++ scientificpython-py.patch   23 Jun 2008 22:19:15 -0000      1.4
@@ -12,8 +12,16 @@
  #include "Scientific/netcdfmodule.h"
 diff -Nurd -x'*~' ScientificPython-2.7.8.orig/setup.py 
ScientificPython-2.7.8/setup.py
 --- ScientificPython-2.7.8.orig/setup.py       2007-11-29 13:07:37.000000000 
-0500
-+++ ScientificPython-2.7.8/setup.py    2008-06-20 17:59:42.000000000 -0400
-@@ -98,7 +98,7 @@
++++ ScientificPython-2.7.8/setup.py    2008-06-23 18:07:53.000000000 -0400
+@@ -91,14 +91,14 @@
+     else:
+         print "Using netCDF installation in ", netcdf_prefix
+         netcdf_include = os.path.join(netcdf_prefix, 'include')
+-        netcdf_h_file = os.path.join(netcdf_prefix, 'include', 'netcdf.h')
++        netcdf_h_file = os.path.join(netcdf_prefix, 'include', 
'libnc-dap/netcdf.h')
+         netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+     ext_modules = [Extension('Scientific_netcdf',
+                              ['Src/Scientific_netcdf.c'],
                               include_dirs=['Include', netcdf_include]
                                            + arrayobject_h_include,
                               library_dirs=[netcdf_lib],

Index: scientificpython-py.info
===================================================================
RCS file: 
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scientificpython-py.info,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- scientificpython-py.info    21 Jun 2008 17:27:44 -0000      1.15
+++ scientificpython-py.info    23 Jun 2008 22:19:15 -0000      1.16
@@ -2,7 +2,7 @@
 
 Package: scientificpython-py%type_pkg[python]
 Version: 2.7.8
-Revision: 2
+Revision: 3
 Distribution: (%type_pkg[python] = 23) 10.3, (%type_pkg[python] = 23) 10.4
 Type: python (2.3 2.4 2.5)
 Maintainer: None <[EMAIL PROTECTED]>
@@ -21,16 +21,12 @@
 Source: 
http://sourcesup.cru.fr/frs/download.php/1835/ScientificPython-%v.tar.gz
 Source-MD5: c63eb3190a093b0b865ba85351a8dd4b
 PatchFile: %{ni}.patch
-PatchFile-MD5: f75d61dfca900f08d418f407dd12da9b
+PatchFile-MD5: ee9fdbc23b851d11cc86b0d94b1c2270
 CompileScript: <<
- #!/bin/sh -ev
- export NETCDF_PREFIX=%p
- %p/bin/python%type_raw[python] setup.py build --numpy
+ %p/bin/python%type_raw[python] setup.py build --numpy --netcdf_prefix=%p
 <<
 InstallScript: <<
- #!/bin/sh -ev
- export NETCDF_PREFIX=%p
- %p/bin/python%type_raw[python] setup.py install --root %d
+ %p/bin/python%type_raw[python] setup.py install --root %d --netcdf_prefix=%p
  mkdir -p %i/share/doc/%n/HTML
  mkdir -p %i/share/doc/%n/PDF
  mv %i/bin/bsp_virtual %i/bin/bsp_virtual%type_raw[python]
@@ -73,6 +69,9 @@
 The netCDF module is OPeNDAP enabled, that is URLs for
 OPeNDAP/DODS servers can be opened like regular netCDF disk files.
 <<
+DescPackaging: <<
+       Use libnc's netcdf instead of netcdf itself because it's better.
+<<
 #Homepage: http://starship.python.net/crew/hinsen/scientific.html
 Homepage: http://sourcesup.cru.fr/projects/scientific-py
 <<


-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to