rpms/python-basemap/EL-5 python-basemap-0.9.5-setup.patch, NONE, 1.1 python-basemap.spec, 1.12, 1.13 sources, 1.9, 1.10 python-basemap-0.9.patch, 1.1, NONE

[Orion Poplawski (orion)]

Author: orion

Update of /cvs/pkgs/rpms/python-basemap/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv22981

Modified Files:
	python-basemap.spec sources 
Added Files:
	python-basemap-0.9.5-setup.patch 
Removed Files:
	python-basemap-0.9.patch 
Log Message:
Sync from F-7 (0.9.5) and update license tag


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",['src/_pyproj.c'],include_dirs = ['src'],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:


Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/EL-5/python-basemap.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- python-basemap.spec	11 Dec 2006 18:43:25 -0000	1.12
+++ python-basemap.spec	1 Oct 2007 21:49:32 -0000	1.13
@@ -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.9.4
-Release:        2%{?dist}
+Version:        0.9.5
+Release:        1%{?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://dl.sf.net/matplotlib/basemap-%{version}.tar.gz
-Patch0:         python-basemap-0.9.patch
+Source0:        http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tgz
+Patch0:         python-basemap-0.9.5-setup.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, proj-devel, shapelib-devel
@@ -16,19 +16,13 @@
 
 %description
 Basemap is a matplotlib toolkit that allows you to plot data on map
- projections (with continental and political boundaries)
+projections (with continental and political boundaries).
+
 
 %prep
 %setup -q -n basemap-%{version}
 %patch0 -p1 -b .orig
 
-#We are going to use the system proj4 library
-mv src/pyproj.* .
-rm -rf src
-
-#Avoid name conflict
-mv examples/README examples/README.examples
-
 
 %build
 %{__python} setup.py build
@@ -38,6 +32,9 @@
 rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install -O1 --skip-build --root=$RPM_BUILD_ROOT
 
+# We ship the data in another package
+rm -rf $RPM_BUILD_ROOT%{_datadir}
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -45,18 +42,20 @@
 
 %files
 %defattr(-,root,root,-)
-%doc Changelog examples/* README LICENSE_pyshapelib
+%doc Changelog README LICENSE_pyshapelib
 %{python_sitearch}/matplotlib/toolkits/basemap/
-%{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
+* Fri Mar 23 2007 Orion Poplawski <orion at cora.nwra.com> 0.9.5-1
+- Update to 0.9.5
+- Ship the examples in a separate rpm
+
 * Mon Dec 11 2006 Orion Poplawski <orion at cora.nwra.com> 0.9.4-2
 - Remove unnecessary (and damaging) line ending change
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/EL-5/sources,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- sources	21 Nov 2006 18:22:05 -0000	1.9
+++ sources	1 Oct 2007 21:49:32 -0000	1.10
@@ -1 +1 @@
-0bbe631db05dbb987bb0bf8e8422039c  basemap-0.9.4.tar.gz
+d214dc6a7201080a8e7419f2a5c8306b  basemap-0.9.5.tgz


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