rpms/ScientificPython/devel ScientificPython-2.6.1-netcdf-64.patch, NONE, 1.1 ScientificPython.spec, 1.12, 1.13

[Ignacio Vazquez-Abrams]

Author: ivazquez

Update of /cvs/pkgs/rpms/ScientificPython/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2545

Modified Files:
	ScientificPython.spec 
Added Files:
	ScientificPython-2.6.1-netcdf-64.patch 
Log Message:
Fix netcdf in lib64

ScientificPython-2.6.1-netcdf-64.patch:

--- NEW FILE ScientificPython-2.6.1-netcdf-64.patch ---
diff -up ScientificPython-2.6.1/setup.py.netcdf-64 ScientificPython-2.6.1/setup.py
--- ScientificPython-2.6.1/setup.py.netcdf-64	2008-12-08 13:58:11.000000000 -0500
+++ ScientificPython-2.6.1/setup.py	2008-12-08 13:58:38.000000000 -0500
@@ -31,7 +31,7 @@ if netcdf_prefix is None:
     except KeyError:
         for netcdf_prefix in ['/usr/local', '/usr', '/sw']:
             netcdf_include = os.path.join(netcdf_prefix, 'include')
-            netcdf_lib = os.path.join(netcdf_prefix, 'lib')
+            netcdf_lib = os.path.join(netcdf_prefix, 'lib64')
             if os.path.exists(os.path.join(netcdf_include, 'netcdf.h')):
                 break
         else:
@@ -47,7 +47,7 @@ if netcdf_prefix is None:
 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_lib = os.path.join(netcdf_prefix, 'lib64')
     ext_modules = [Extension('Scientific_netcdf',
                              ['Src/Scientific_netcdf.c'],
                              include_dirs=['Include', netcdf_include]


Index: ScientificPython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ScientificPython/devel/ScientificPython.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ScientificPython.spec	8 Dec 2008 18:43:40 -0000	1.12
+++ ScientificPython.spec	8 Dec 2008 19:02:04 -0000	1.13
@@ -3,14 +3,14 @@
 
 Name:           ScientificPython
 Version:        2.6.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        A collection of Python modules that are useful for scientific computing
 
 Group:          Development/Languages
 License:        CeCILL
 URL:            http://dirac.cnrs-orleans.fr/ScientificPython/
 Source0:        http://sourcesup.cru.fr/frs/download.php/1034/ScientificPython-2.6.1.tar.gz
-Patch1:         ScientificPython-netcdf-64bit-location.patch
+Patch0:         ScientificPython-2.6.1-netcdf-64.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel
@@ -69,7 +69,7 @@
 %prep
 %setup -q
 %ifarch x86_64
-%patch1 -p1
+%patch0 -p 1 -b .netcdf-64
 %endif
 
 %build
@@ -150,6 +150,9 @@
 %doc Doc/Reference Examples Doc/BSP_Tutorial.pdf
 
 %changelog
+* Mon Dec  8 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6.1-5
+- Fix netcdf in lib64
+
 * Mon Dec  8 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm at gmail.com> - 2.6.1-4
 - Remove obsolete patch