rpms/python-basemap/devel python-basemap-0.9.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 python-basemap.spec, 1.6, 1.7 sources, 1.4, 1.5 python-basemap-0.8.1.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-serv31006

Modified Files:
	.cvsignore python-basemap.spec sources 
Added Files:
	python-basemap-0.9.patch 
Removed Files:
	python-basemap-0.8.1.patch 
Log Message:
Update to upstream 0.9


python-basemap-0.9.patch:

--- NEW FILE python-basemap-0.9.patch ---
--- basemap-0.9/setup.py.orig	2006-06-07 11:36:02.000000000 -0600
+++ basemap-0.9/setup.py	2006-07-03 11:54:16.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:
@@ -21,36 +21,27 @@
 
 deps = glob.glob('src/*.c')
 
-extensions = [Extension("pyproj",deps,include_dirs = ['src'],)]
+extensions = [Extension("pyproj",['pyproj.c'],libraries=["proj"])]
 packages          = ['matplotlib.toolkits.basemap']
 package_dirs       = {'':'lib'}
 
-# only install shapelib and dbflib if user hasn't got them.
-#try: import shapelib
-#except ImportError: haveshapelib = False
-#else: haveshapelib = True
-#try: import dbflib
-#except ImportError: havedbflib = False
-#else: havedbflib = True
-#if not haveshapelib or not havedbflib:
-# always intall shapelib and dbflib.
+# Always build pyshapelib for RPM consistency, uses system shapelib
 if 1:
     packages = packages + ['shapelib','dbflib']
     package_dirs['shapelib'] ='lib/shapelib'
     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:


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	27 Feb 2006 17:37:44 -0000	1.4
+++ .cvsignore	3 Jul 2006 21:34:46 -0000	1.5
@@ -1 +1 @@
-basemap-0.8.2.tar.gz
+basemap-0.9.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- python-basemap.spec	6 Mar 2006 22:05:44 -0000	1.6
+++ python-basemap.spec	3 Jul 2006 21:34:46 -0000	1.7
@@ -1,14 +1,14 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-basemap
-Version:        0.8.2
-Release:        3%{?dist}
+Version:        0.9
+Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
 License:        MIT and GPL
 URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
 Source0:        http://dl.sf.net/matplotlib/basemap-%{version}.tar.gz
-Patch0:         python-basemap-0.8.1.patch
+Patch0:         python-basemap-0.9.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, proj-devel, shapelib-devel
@@ -23,7 +23,7 @@
 %patch0 -p1 -b .orig
 
 #We are going to use the system proj4 library
-mv src/proj4.* .
+mv src/pyproj.* .
 rm -rf src
 
 #Avoid name conflict
@@ -50,15 +50,19 @@
 %defattr(-,root,root,-)
 %doc Changelog examples/* README LICENSE_pyshapelib
 %{python_sitearch}/matplotlib/toolkits/basemap/
-%{python_sitearch}/proj4.so
+%{python_sitearch}/pyproj.so
 %{python_sitearch}/dbflib/
 %{python_sitearch}/dbflibc.so
 %{python_sitearch}/shapelib/
 %{python_sitearch}/shapelibc.so
 %{python_sitearch}/shptree.so
+%{_datadir}/basemap/
 
 
 %changelog
+* Mon Jul  3 2006 Orion Poplawski <orion at cora.nwra.com> 0.9-1
+- Update to upstream 0.9
+
 * Mon Mar  6 2006 Orion Poplawski <orion at cora.nwra.com> 0.8.2-3
 - Rebuild for updated shapelib
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	27 Feb 2006 17:37:44 -0000	1.4
+++ sources	3 Jul 2006 21:34:46 -0000	1.5
@@ -1 +1 @@
-2cf0381c22cb41e3ad26b51595b36799  basemap-0.8.2.tar.gz
+f4101f64f7e8036a075e40a0d9ad57ba  basemap-0.9.tar.gz


--- python-basemap-0.8.1.patch DELETED ---