rpms/python-basemap/devel python-basemap-0.9.5-setup.patch, 1.2, 1.3 python-basemap.spec, 1.15, 1.16

[Orion Poplawski (orion)]

Author: orion

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

Modified Files:
	python-basemap-0.9.5-setup.patch python-basemap.spec 
Log Message:
* Thu Aug 23 2007 Orion Poplawski <orion at cora.nwra.com> 0.9.5-3
- Explicitly remove included libraries in prep
- Update license tag to LGPLv2+
- Rebuild for BuildID


python-basemap-0.9.5-setup.patch:

Index: python-basemap-0.9.5-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap-0.9.5-setup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-basemap-0.9.5-setup.patch	29 Mar 2007 15:30:26 -0000	1.2
+++ python-basemap-0.9.5-setup.patch	23 Aug 2007 16:30:20 -0000	1.3
@@ -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",['src/_pyproj.c'],include_dirs = ['src'],libraries=["proj"])]
++extensions = [Extension("matplotlib.toolkits.basemap._pyproj",['_pyproj.c'],libraries=["proj"])]
  
  # only install shapelib and dbflib if user hasn't got them.
  #try: import shapelib


Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- python-basemap.spec	6 Jun 2007 17:03:41 -0000	1.15
+++ python-basemap.spec	23 Aug 2007 16:30:20 -0000	1.16
@@ -2,10 +2,10 @@
 
 Name:           python-basemap
 Version:        0.9.5
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
-License:        MIT and GPL
+License:        LGPLv2+
 URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
 Source0:        http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tgz
 Patch0:         python-basemap-0.9.5-setup.patch
@@ -22,6 +22,9 @@
 %prep
 %setup -q -n basemap-%{version}
 %patch0 -p1 -b .orig
+#Remove the bundled libraries
+mv src/_pyproj.c src/basemap_pycompat.h .
+rm -rf src pyshapelib/shapelib
 
 
 %build
@@ -52,6 +55,11 @@
 
 
 %changelog
+* Thu Aug 23 2007 Orion Poplawski <orion at cora.nwra.com> 0.9.5-3
+- Explicitly remove included libraries in prep
+- Update license tag to LGPLv2+
+- Rebuild for BuildID
+
 * Wed Jun 06 2007 Orion Poplawski <orion at cora.nwra.com> 0.9.5-2
 - Rebuild