[netcdf4-python] Move rpath change to rpath patch

[Orion Poplawski]

commit 21dd4bc572f18ba70cb2c3f0415e7c2557e4b0fb
Author: Orion Poplawski <orion at nwra.com>
Date:   Fri May 9 15:41:43 2014 -0600

    Move rpath change to rpath patch

 netcdf4-python-libs.patch    |    9 ---------
 netcdf4-python-norpath.patch |    9 +++++++++
 2 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/netcdf4-python-libs.patch b/netcdf4-python-libs.patch
index e5d428c..af5e64a 100644
--- a/netcdf4-python-libs.patch
+++ b/netcdf4-python-libs.patch
@@ -12,12 +12,3 @@ diff -up netcdf4-python-92c0a1ca62b22d4173622122226c060de3c063c6/setup.py.libs n
      inc_dirs = [netCDF4_incdir,HDF5_incdir]
  
      # add szip to link if desired.
-@@ -327,7 +327,7 @@ if has_cython and 'sdist' not in sys.arg
-     cmdclass = {'build_ext': build_ext}
- else:
-     # use existing netCDF4.c, don't need cython.
--    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs)]
-+    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs)]
-     cmdclass = {}
- 
- setup(name = "netCDF4",
diff --git a/netcdf4-python-norpath.patch b/netcdf4-python-norpath.patch
index 0c82c05..919860e 100644
--- a/netcdf4-python-norpath.patch
+++ b/netcdf4-python-norpath.patch
@@ -10,3 +10,12 @@ diff -up netCDF4-1.0.7/setup.py.norpath netCDF4-1.0.7/setup.py
      # remove netCDF4.c file if it exists, so cython will recompile netCDF4.pyx.
      if len(sys.argv) >= 2 and 'build' in sys.argv[1:] and os.path.exists('netCDF4.c'):
          os.remove('netCDF4.c')
+@@ -327,7 +327,7 @@ if has_cython and 'sdist' not in sys.arg
+     cmdclass = {'build_ext': build_ext}
+ else:
+     # use existing netCDF4.c, don't need cython.
+-    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs,runtime_library_dirs=lib_dirs)]
++    extensions = [Extension("netCDF4",["netCDF4.c"],libraries=libs,library_dirs=lib_dirs,include_dirs=inc_dirs)]
+     cmdclass = {}
+ 
+ setup(name = "netCDF4",