From d50124ca781467c3f4d3e2a1d561f4ba1a4b447c Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Dec 11 2009 17:30:17 +0000 Subject: New upstream. --- diff --git a/.cvsignore b/.cvsignore index 23b0e92..21e8811 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -basemap-0.99.2.tar.gz +basemap-0.99.4.tar.gz diff --git a/python-basemap.spec b/python-basemap.spec index 5a0398a..1f508b0 100644 --- a/python-basemap.spec +++ b/python-basemap.spec @@ -1,8 +1,8 @@ %{!?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.2 -Release: 5%{?dist} +Version: 0.99.4 +Release: 1%{?dist} Summary: Plots data on map projections (with continental and political boundaries) Group: Development/Libraries License: LGPLv2+ @@ -10,7 +10,7 @@ URL: http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.ba Source0: http://downloads.sourceforge.net/matplotlib/basemap-%{version}.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-0.99-datadir.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: python-devel, proj-devel, shapelib-devel, numpy-f2py, geos-devel @@ -26,7 +26,7 @@ projections (with continental and political boundaries). %setup -q -n basemap-%{version} #%patch0 -p0 #%patch1 -p0 -%patch2 -p0 +#%patch2 -p0 #Remove the bundled libraries #mv src/_pyproj.c src/basemap_pycompat.h . #rm -rf src pyshapelib/shapelib @@ -36,6 +36,7 @@ rm -rf lib/mpl_toolkits/basemap/data/ %build export GEOS_LIB="/usr/" +export BASEMAPDATA="/usr/share/basemap" %{__python} setup.py config %{__python} setup.py build @@ -67,6 +68,10 @@ rm -rf $RPM_BUILD_ROOT %{python_sitearch}/_geoslib.so %changelog +* Fri Dec 11 2009 Jon Ciesla - 0.99.4-1 +- Update to latest upstream. +- Dropped datadir patch, now handled with environment variable. + * Sun Jul 26 2009 Fedora Release Engineering - 0.99.2-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 3ff8e4b..b60a75a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ba81a00fa77daf71cb27fca5f4c86fb9 basemap-0.99.2.tar.gz +07fe1a01c321c43db4739c18e99d4d44 basemap-0.99.4.tar.gz