rpms/python-basemap/devel python-basemap-0.9.5-setup.patch, NONE, 1.1 python-basemap-0.9.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/extras/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv7605

Added Files:
	python-basemap-0.9.5-setup.patch 
Removed Files:
	python-basemap-0.9.patch 
Log Message:
Update the patches


python-basemap-0.9.5-setup.patch:

--- NEW FILE python-basemap-0.9.5-setup.patch ---
--- basemap-0.9.5/setup.py.orig	2007-03-15 07:26:43.000000000 -0600
+++ basemap-0.9.5/setup.py	2007-03-23 15:36:02.000000000 -0600
@@ -11,7 +11,7 @@
     DBFUpdateHeader is available, we scan shapefil.h for the string
     'DBFUpdateHeader'.
     """
-    f = open(convert_path("pyshapelib/shapelib/shapefil.h"))
+    f = open(convert_path("/usr/include/libshp/shapefil.h"))
     contents = f.read()
     f.close()
     if contents.find("DBFUpdateHeader") >= 0:
@@ -23,7 +23,7 @@
 
 packages          = ['matplotlib.toolkits.basemap']
 package_dirs       = {'':'lib'}
-extensions = [Extension("matplotlib.toolkits.basemap._pyproj",deps,include_dirs = ['src'],)]
+extensions = [Extension("matplotlib.toolkits.basemap._pyproj",['pyproj.c'],libraries=["proj"])]
 
 # only install shapelib and dbflib if user hasn't got them.
 #try: import shapelib
@@ -40,17 +40,16 @@
     package_dirs['dbflib'] ='lib/dbflib'
     extensions = extensions + \
              [Extension("shapelibc",
-                        ["pyshapelib/shapelib_wrap.c",
-                         "pyshapelib/shapelib/shpopen.c",
-                         "pyshapelib/shapelib/shptree.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
+                        ["pyshapelib/shapelib_wrap.c"[,
+                        include_dirs = ["/usr/include/libshp"],
+                        libraries=["shp"]),
               Extension("shptree",
                         ["pyshapelib/shptreemodule.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
+                        include_dirs = ["/usr/include/libshp"]),
               Extension("dbflibc",
-                        ["pyshapelib/dbflib_wrap.c",
-                         "pyshapelib/shapelib/dbfopen.c"],
-                        include_dirs = ["pyshapelib/shapelib"],
+                        ["pyshapelib/dbflib_wrap.c"],
+                        include_dirs = ["/usr/include/libshp"],
+                        libraries=["shp"]),
                         define_macros = dbf_macros()) ]
 
 if 'setuptools' in sys.modules:


--- python-basemap-0.9.patch DELETED ---