rpms/python-basemap/devel python-basemap-0.9.5-setup.patch, 1.1, 1.2 python-basemap.spec, 1.13, 1.14

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	python-basemap-0.9.5-setup.patch python-basemap.spec 
Log Message:
Actual working versions


python-basemap-0.9.5-setup.patch:

Index: python-basemap-0.9.5-setup.patch
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap-0.9.5-setup.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-basemap-0.9.5-setup.patch	28 Mar 2007 23:18:18 -0000	1.1
+++ python-basemap-0.9.5-setup.patch	29 Mar 2007 15:30:26 -0000	1.2
@@ -14,7 +14,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"])]
++extensions = [Extension("matplotlib.toolkits.basemap._pyproj",['src/_pyproj.c'],include_dirs = ['src'],libraries=["proj"])]
  
  # only install shapelib and dbflib if user hasn't got them.
  #try: import shapelib
@@ -26,7 +26,7 @@
 -                         "pyshapelib/shapelib/shpopen.c",
 -                         "pyshapelib/shapelib/shptree.c"],
 -                        include_dirs = ["pyshapelib/shapelib"]),
-+                        ["pyshapelib/shapelib_wrap.c"[,
++                        ["pyshapelib/shapelib_wrap.c"],
 +                        include_dirs = ["/usr/include/libshp"],
 +                        libraries=["shp"]),
                Extension("shptree",
@@ -39,7 +39,7 @@
 -                        include_dirs = ["pyshapelib/shapelib"],
 +                        ["pyshapelib/dbflib_wrap.c"],
 +                        include_dirs = ["/usr/include/libshp"],
-+                        libraries=["shp"]),
++                        libraries=["shp"],
                          define_macros = dbf_macros()) ]
  
  if 'setuptools' in sys.modules:


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- python-basemap.spec	28 Mar 2007 23:11:58 -0000	1.13
+++ python-basemap.spec	29 Mar 2007 15:30:26 -0000	1.14
@@ -23,10 +23,6 @@
 %setup -q -n basemap-%{version}
 %patch0 -p1 -b .orig
 
-#We are going to use the system proj4 library
-mv src/pyproj.* .
-rm -rf src
-
 
 %build
 %{__python} setup.py build
@@ -48,7 +44,6 @@
 %defattr(-,root,root,-)
 %doc Changelog README LICENSE_pyshapelib
 %{python_sitearch}/matplotlib/toolkits/basemap/
-%{python_sitearch}/pyproj.so
 %{python_sitearch}/dbflib/
 %{python_sitearch}/dbflibc.so
 %{python_sitearch}/shapelib/