rpms/python-basemap/devel python-basemap-0.99-datadir.patch, 1.1, 1.2 python-basemap.spec, 1.33, 1.34

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/python-basemap/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24297

Modified Files:
	python-basemap-0.99-datadir.patch python-basemap.spec 
Log Message:
* Mon Apr 12 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-6
- Fix the data directory patch. 


python-basemap-0.99-datadir.patch:
 __init__.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: python-basemap-0.99-datadir.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap-0.99-datadir.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- python-basemap-0.99-datadir.patch	12 Dec 2008 17:48:36 -0000	1.1
+++ python-basemap-0.99-datadir.patch	13 Apr 2010 04:19:17 -0000	1.2
@@ -1,11 +1,12 @@
---- lib/mpl_toolkits/basemap/__init__.py	2008-12-10 03:22:41.000000000 -0900
-+++ lib/mpl_toolkits/basemap/__init__.py.new	2008-12-12 00:00:21.000000000 -0900
-@@ -39,7 +39,7 @@
- import _geoslib, netcdftime
+diff -r -u basemap-0.99.4/lib/mpl_toolkits/basemap/__init__.py basemap-0.99.4-new/lib/mpl_toolkits/basemap/__init__.py
+--- basemap-0.99.4/lib/mpl_toolkits/basemap/__init__.py	2009-08-05 09:28:16.000000000 -0800
++++ basemap-0.99.4-new/lib/mpl_toolkits/basemap/__init__.py	2010-04-12 19:42:45.000000000 -0800
+@@ -51,7 +51,7 @@
+     if not os.path.isdir(basemap_datadir):
+         raise RuntimeError('Path in environment BASEMAPDATA not a directory')
+ else:
+-    basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
++    basemap_datadir = '/usr/share/basemap'
  
- # basemap data files now installed in lib/matplotlib/toolkits/basemap/data
--basemap_datadir = os.sep.join([os.path.dirname(__file__), 'data'])
-+basemap_datadir = '/usr/share/basemap'
- 
- __version__ = '0.99.2'
+ __version__ = '0.99.4'
  


Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -p -r1.33 -r1.34
--- python-basemap.spec	13 Apr 2010 03:20:55 -0000	1.33
+++ python-basemap.spec	13 Apr 2010 04:19:17 -0000	1.34
@@ -2,7 +2,7 @@
 
 Name:           python-basemap
 Version:        0.99.4
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
 License:        LGPLv2+
@@ -26,7 +26,7 @@ projections (with continental and politi
 %setup -q -n basemap-%{version}
 #%patch0 -p0
 #%patch1 -p0
-%patch2 -p0
+%patch2 -p1
 #Remove the bundled libraries
 #mv src/_pyproj.c src/basemap_pycompat.h .
 #rm -rf src pyshapelib/shapelib
@@ -67,7 +67,10 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/_geoslib.so
 
 %changelog
-* Thu Apr 01 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-5
+* Mon Apr 12 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-6
+- Fix the data directory patch. 
+
+* Mon Apr 12 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-5
 - Rebuild to for geos soname bump and numpy 1.3 reversion. 
 
 * Thu Apr 01 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-4