diff --git a/.gitignore b/.gitignore index 6ce2373..7ddafe6 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ basemap-0.99.4.tar.gz basemap-0.99.4-examples.tar.gz +/basemap-1.0.6.tar.gz diff --git a/python-basemap-1.0.6-datadir.patch b/python-basemap-1.0.6-datadir.patch new file mode 100644 index 0000000..fa9e4ae --- /dev/null +++ b/python-basemap-1.0.6-datadir.patch @@ -0,0 +1,22 @@ +--- basemap-1.0.6/lib/mpl_toolkits/basemap/__init__.py~ 2013-01-12 10:55:30.000000000 -0600 ++++ basemap-1.0.6/lib/mpl_toolkits/basemap/__init__.py 2013-02-04 11:06:33.414101599 -0600 +@@ -45,7 +45,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' + + __version__ = '1.0.6' + +--- basemap-1.0.6/lib/mpl_toolkits/basemap/pyproj.py~ 2013-01-12 10:55:37.000000000 -0600 ++++ basemap-1.0.6/lib/mpl_toolkits/basemap/pyproj.py 2013-02-04 11:12:04.758094206 -0600 +@@ -235,7 +235,7 @@ + "sphere": {'a':6370997.0,'b':6370997.0,'description':"Normal Sphere"}, + } + +-pyproj_datadir = os.sep.join([os.path.dirname(__file__), 'data']) ++pyproj_datadir = '/usr/share/basemap' + if not os.path.isdir(pyproj_datadir): + msg="proj data directory not found. Expecting it at: %s"%pyproj_datadir + raise IOError(msg) diff --git a/python-basemap.spec b/python-basemap.spec index 229287b..21b4d2c 100644 --- a/python-basemap.spec +++ b/python-basemap.spec @@ -1,17 +1,17 @@ %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} Name: python-basemap -Version: 0.99.4 -Release: 17%{?dist} +Version: 1.0.6 +Release: 1%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: LGPLv2+ URL: http://matplotlib.sourceforge.net/users/toolkits.html Source0: http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tar.gz -Source1: http://dl.sf.net/matplotlib/basemap-%{version}-examples.tar.gz +#Source1: http://dl.sf.net/matplotlib/basemap-%{version}-examples.tar.gz #Patch0: python-basemap-0.99-setup.cfg.patch #Patch1: python-basemap-0.99-setup.patch -Patch2: python-basemap-0.99-datadir.patch +Patch2: python-basemap-1.0.6-datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, proj-devel, shapelib-devel, numpy-f2py, geos-devel @@ -63,15 +63,15 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) -%doc Changelog README LICENSE_pyshapelib +%doc Changelog README %exclude %{python_sitearch}/mpl_toolkits/__init__.* %{python_sitearch}/mpl_toolkits/basemap -%{python_sitearch}/dbflib/ -%{python_sitearch}/dap/ -%{python_sitearch}/dbflibc.so -%{python_sitearch}/shapelib/ -%{python_sitearch}/shapelibc.so -%{python_sitearch}/shptree.so +#%{python_sitearch}/dbflib/ +#%{python_sitearch}/dap/ +#%{python_sitearch}/dbflibc.so +#%{python_sitearch}/shapelib/ +#%{python_sitearch}/shapelibc.so +#%{python_sitearch}/shptree.so %{python_sitearch}/*.egg-info %{python_sitearch}/_geoslib.so @@ -80,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT %doc examples/* %changelog +* Mon Feb 04 2013 Jon Ciesla - 1.0.6-1 +- Latest upstream, 870640. + * Sun Jan 27 2013 Jon Ciesla - 0.99.4-17 - Rebuild for geos soname bump. diff --git a/sources b/sources index 1853a20..5fc13f6 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -07fe1a01c321c43db4739c18e99d4d44 basemap-0.99.4.tar.gz -3700f4d59b9b01e33db30b7c83f69071 basemap-0.99.4-examples.tar.gz +fc71c96c76eb8208cafce84d6532ee1b basemap-1.0.6.tar.gz