rpms/ScientificPython/F-11 ScientificPython-netcdf-better-location.patch, 1.1, 1.2 ScientificPython.spec, 1.19, 1.20

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/ScientificPython/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv11084

Modified Files:
	ScientificPython-netcdf-better-location.patch 
	ScientificPython.spec 
Log Message:
* Wed Jul 15 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-6
- Even better patch!


ScientificPython-netcdf-better-location.patch:

Index: ScientificPython-netcdf-better-location.patch
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/F-11/ScientificPython-netcdf-better-location.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- ScientificPython-netcdf-better-location.patch	15 Jul 2009 17:21:23 -0000	1.1
+++ ScientificPython-netcdf-better-location.patch	15 Jul 2009 19:57:39 -0000	1.2
@@ -1,5 +1,5 @@
 --- setup.py.old	2009-07-15 08:29:35.000000000 -0800
-+++ setup.py	2009-07-15 08:39:20.000000000 -0800
++++ setup.py	2009-07-15 09:33:45.000000000 -0800
 @@ -45,6 +45,9 @@
                                   "Lib/site-packages/numpy/core/include")]
      else:
@@ -10,8 +10,12 @@
                                  "lib/python%s.%s/site-packages/numpy/core/include"
                                  % sys.version_info [:2])]
  
-@@ -77,11 +80,21 @@
+@@ -75,13 +78,25 @@
+         netcdf_prefix=os.environ['NETCDF_PREFIX']
+     except KeyError:
          pass
++netcdf_include=None
++netcdf_lib=None
  if netcdf_prefix is None:
      for netcdf_prefix in ['/usr/local', '/usr', '/sw']:
 -        netcdf_include = os.path.join(netcdf_prefix, 'include')
@@ -37,3 +41,16 @@
          netcdf_prefix = None
  
  if netcdf_prefix is None:
+@@ -105,9 +120,9 @@
+         options['bdist_wininst'] = {'install_script': "scientific_win32_postinstall.py"}
+     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_lib = os.path.join(netcdf_prefix, 'lib')
++        if netcdf_include == None: netcdf_include = os.path.join(netcdf_prefix, 'include')
++        netcdf_h_file = os.path.join(netcdf_include, 'netcdf.h')
++        if netcdf_lib==None: netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+     ext_modules = [Extension('Scientific_netcdf',
+                              ['Src/Scientific_netcdf.c'],
+                              include_dirs=['Include', netcdf_include]


Index: ScientificPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/F-11/ScientificPython.spec,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- ScientificPython.spec	15 Jul 2009 17:21:23 -0000	1.19
+++ ScientificPython.spec	15 Jul 2009 19:57:40 -0000	1.20
@@ -3,7 +3,7 @@
 
 Name:           ScientificPython
 Version:        2.8
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A collection of Python modules that are useful for scientific computing
 
 Group:          Development/Languages
@@ -121,7 +121,13 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/Scientific/Functions
 %{python_sitearch}/Scientific/Geometry
 %{python_sitearch}/Scientific/IO
-%{python_sitearch}/Scientific/linux2
+%dir %{python_sitearch}/Scientific/linux2
+%{python_sitearch}/Scientific/linux2/Scientific_affinitypropagation.so
+%{python_sitearch}/Scientific/linux2/Scientific_interpolation.so
+%{python_sitearch}/Scientific/linux2/Scientific_netcdf.so
+%{python_sitearch}/Scientific/linux2/Scientific_numerics_package_id.so
+%{python_sitearch}/Scientific/linux2/Scientific_vector.so
+
 %{python_sitearch}/Scientific/Physics
 %{python_sitearch}/Scientific/Signals
 %{python_sitearch}/Scientific/Statistics
@@ -156,6 +162,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
 
 %changelog
+* Wed Jul 15 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-6
+- Even better patch!
+
 * Wed Jul 15 2009 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 2.8-5
 - Fix netcdf location patch with better long term fix provided 
   by user in bug 511313