rpms/python-basemap/devel python-basemap-0.8.1.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 python-basemap.spec, 1.1, 1.2 sources, 1.2, 1.3 python-basemap-0.7.2.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-serv2792

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


python-basemap-0.8.1.patch:

--- NEW FILE python-basemap-0.8.1.patch ---
--- basemap-0.8.1/setup.py.orig	2006-02-03 13:39:36.000000000 -0700
+++ basemap-0.8.1/setup.py	2006-02-24 15:49:37.000000000 -0700
@@ -12,7 +12,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:
@@ -20,35 +20,28 @@
     else:
         return [("HAVE_UPDATE_HEADER", "0")]
 
-deps = glob.glob('src/*.c')
-
-extensions = [Extension("proj4",deps,include_dirs = ['src'],)]
+extensions = [Extension("proj4",['proj4.c'],libraries=["proj"])]
 packages          = ['matplotlib.toolkits.basemap']
 package_dirs       = {'':'lib'}
 
-# don't build pyshapelib if it is already installed.
+# Always build pyshapelib for RPM consistency, uses system shapelib
 
-try:
-    import shapelib
-    import dbflib
-except:
-    packages = packages + ['shapelib','dbflib']
-    package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
-    package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
-    extensions = extensions + \
-             [Extension("shapelibc",
-                        ["pyshapelib/shapelib_wrap.c",
-                         "pyshapelib/shapelib/shpopen.c",
-                         "pyshapelib/shapelib/shptree.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("shptree",
-                        ["pyshapelib/shptreemodule.c"],
-                        include_dirs = ["pyshapelib/shapelib"]),
-              Extension("dbflibc",
-                        ["pyshapelib/dbflib_wrap.c",
-                         "pyshapelib/shapelib/dbfopen.c"],
-                        include_dirs = ["pyshapelib/shapelib"],
-                        define_macros = dbf_macros()) ]
+packages = packages + ['shapelib','dbflib']
+package_dirs['shapelib'] ='pyshapelib/lib/shapelib'
+package_dirs['dbflib'] ='pyshapelib/lib/dbflib'
+extensions = extensions + \
+         [Extension("shapelibc",
+                    ["pyshapelib/shapelib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries=["shp"]),
+          Extension("shptree",
+                    ["pyshapelib/shptreemodule.c"],
+                    include_dirs = ["/usr/include/libshp"]),
+          Extension("dbflibc",
+                    ["pyshapelib/dbflib_wrap.c"],
+                    include_dirs = ["/usr/include/libshp"],
+                    libraries = ["shp"],
+                    define_macros = dbf_macros()) ]
 
 try:
     additional_params # has setupegg.py provided


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	4 Jan 2006 20:29:21 -0000	1.2
+++ .cvsignore	24 Feb 2006 22:53:42 -0000	1.3
@@ -1 +1 @@
-basemap-0.7.2.1.tar.gz
+basemap-0.8.1.tar.gz


Index: python-basemap.spec
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- python-basemap.spec	4 Jan 2006 20:29:21 -0000	1.1
+++ python-basemap.spec	24 Feb 2006 22:53:42 -0000	1.2
@@ -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.7.2.1
+Version:        0.8.1
 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.7.2.1.patch
+Patch0:         python-basemap-0.8.1.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, proj-devel, shapelib-devel
@@ -61,6 +61,9 @@
 
 
 %changelog
+* Fri Feb 24 2006 Orion Poplawski <orion at cora.nwra.com> 0.8.1-1
+- Update to upstream 0.8.1
+
 * Sun Nov 20 2005 Orion Poplawski <orion at cora.nwra.com> 0.7.2.1-1
 - Update to upstream 0.7.2.1
 - Split into python-basemap and python-basemap-data


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/python-basemap/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	4 Jan 2006 20:29:21 -0000	1.2
+++ sources	24 Feb 2006 22:53:42 -0000	1.3
@@ -1 +1 @@
-580144218a66e2cb227959f97809f68e  basemap-0.7.2.1.tar.gz
+b7dd2e60cdbd73130195c7b3a462d542  basemap-0.8.1.tar.gz


--- python-basemap-0.7.2.1.patch DELETED ---