rpms/ScientificPython/devel ScientificPython-netcdf-64bit-location.patch, NONE, 1.1 ScientificPython.spec, 1.1, 1.2

[Jef Spaleta (jspaleta) <fedora-extras-commits redhat com>]

Author: jspaleta

Update of /cvs/extras/rpms/ScientificPython/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4429/devel

Modified Files:
	ScientificPython.spec 
Added Files:
	ScientificPython-netcdf-64bit-location.patch 
Log Message:
auto-import ScientificPython-2.6-6.fc7 on branch devel from ScientificPython-2.6-6.fc7.src.rpm

ScientificPython-netcdf-64bit-location.patch:

--- NEW FILE ScientificPython-netcdf-64bit-location.patch ---
--- ScientificPython-2.6-BAD/setup.py	2006-10-06 05:38:29.000000000 -0800
+++ ScientificPython-2.6/setup.py	2006-12-25 23:17:34.000000000 -0900
@@ -12,7 +12,7 @@
 # If your netCDF installation is in a non-standard place, set the following
 # variable to the base directory, or set the environment variable
 # NETCDF_PREFIX before running setup.py
-netcdf_prefix = None
+netcdf_prefix = 'netcdf-3'
 
 class Dummy:
     pass
@@ -43,8 +43,8 @@
     ext_modules = []
 else:
     print "Using netCDF installation in ", netcdf_prefix
-    netcdf_include = os.path.join(netcdf_prefix, 'include')
-    netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+    netcdf_include = os.path.join('/usr/include/',netcdf_prefix)
+    netcdf_lib = os.path.join('/usr/lib64/',netcdf_prefix)
     ext_modules = [Extension('Scientific_netcdf',
                              ['Src/Scientific_netcdf.c'],
                              include_dirs=['Include', netcdf_include]


Index: ScientificPython.spec
===================================================================
RCS file: /cvs/extras/rpms/ScientificPython/devel/ScientificPython.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ScientificPython.spec	31 Dec 2006 03:15:45 -0000	1.1
+++ ScientificPython.spec	31 Dec 2006 08:04:03 -0000	1.2
@@ -3,7 +3,7 @@
 
 Name:           ScientificPython
 Version:        2.6
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        A collection of Python modules that are useful for scientific computing
 
 Group:          Development/Languages
@@ -11,6 +11,7 @@
 URL:            http://dirac.cnrs-orleans.fr/ScientificPython/
 Source0:        http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-2.6.tar.gz
 Patch0:         ScientificPython-netcdf-location.patch
+Patch1:         ScientificPython-netcdf-64bit-location.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -68,7 +69,11 @@
 
 %prep
 %setup -q
+%ifarch x86_64
+%patch1 -p1
+%else
 %patch0 -p1
+%endif
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
@@ -147,6 +152,9 @@
 %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
 
 %changelog
+* Sat Dec 30 2006 Jef Spaleta <jspaleta gmail com> 2.6-6
+- Correct for netcdf location patch to work with /usr/lib/lib64
+
 * Thu Dec 28 2006 Jef Spaleta <jspaleta gmail com> 2.6-5
 - remove mpi and bsp subpackages. On more thought, 
 -   it makes more sense to have the parallel computing items