From dbbc180cd84ab313f04b7b2dd312448ccc7ca043 Mon Sep 17 00:00:00 2001
From: Jef Spaleta <jspaleta@fedoraproject.org>
Date: Dec 12 2008 10:25:18 +0000
Subject: - Update to latest release


---

diff --git a/python-basemap-0.99-setup.patch b/python-basemap-0.99-setup.patch
index 29d8769..dc14d97 100644
--- a/python-basemap-0.99-setup.patch
+++ b/python-basemap-0.99-setup.patch
@@ -1,6 +1,6 @@
---- setup.py	2008-05-31 06:55:06.000000000 -0800
-+++ setup.py.new	2008-07-02 13:42:57.000000000 -0800
-@@ -55,11 +55,12 @@
+--- setup.py	2008-07-11 16:18:34.000000000 -0800
++++ setup.py	2008-12-11 23:40:17.000000000 -0900
+@@ -45,11 +45,11 @@
  
  if GEOS_dir is None:
      # if GEOS_dir not set, check a few standard locations.
@@ -10,17 +10,7 @@
          geos_version = checkversion(direc)
          print 'checking for GEOS lib in %s ....' % direc
 -        if geos_version != '"2.2.3"':
-+        if geos_version != '"3.0.1"':
-+            print "geos_version mismatch",geos_version
++        if geos_version is not None:
              continue
          else:
              print 'GEOS lib found in %s' % direc
-@@ -77,6 +78,8 @@
- #manually and set the variable GEOS_dir (right after the line
- #that says "set GEOS_dir manually here".""")
- #else:
-+print numpy.get_include()
-+print GEOS_dir
- geos_include_dirs=[os.path.join(GEOS_dir,'include'),numpy.get_include()]
- geos_library_dirs=[os.path.join(GEOS_dir,'lib'),os.path.join(GEOS_dir,'lib64')]
- 
diff --git a/python-basemap.spec b/python-basemap.spec
index 6941d60..7cfa869 100644
--- a/python-basemap.spec
+++ b/python-basemap.spec
@@ -1,18 +1,16 @@
 %{!?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
-Release:        6%{?dist}
+Version:        0.99.2
+Release:        1%{?dist}
 Summary:        Plots data on map projections (with continental and political boundaries) 
 Group:          Development/Libraries
 License:        LGPLv2+
 URL:            http://matplotlib.sourceforge.net/matplotlib.toolkits.basemap.basemap.html
 Source0:        http://downloads.sourceforge.net/matplotlib/basemap-%{version}.tar.gz
-Patch0:         python-basemap-0.99-setup.cfg.patch
-# WARNING: The 2 patches below have to be updated for every single new GEOS version.
-#          Maybe the checks should be patched out entirely instead?
-Patch1:         python-basemap-0.99-setup.patch
-Patch2:         python-basemap-0.99-geos-3.0.1-runtime-check.patch
+#Patch0:         python-basemap-0.99-setup.cfg.patch
+#Patch1:         python-basemap-0.99-setup.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,geos-devel 
@@ -26,16 +24,19 @@ projections (with continental and political boundaries).
 
 %prep
 %setup -q -n basemap-%{version}
-%patch0 -p0
-%patch1 -p0
-%patch2 -p1
+#%patch0 -p0
+#%patch1 -p0
+%patch2 -p0
 #Remove the bundled libraries
 #mv src/_pyproj.c src/basemap_pycompat.h .
 #rm -rf src pyshapelib/shapelib
 #rm -rf src goes-2.2.3/
-
+#Remove the data files
+rm -rf lib/mpl_toolkits/basemap/data/
 
 %build
+export GEOS_LIB="/usr/"
+%{__python} setup.py config
 %{__python} setup.py build
 
 
@@ -57,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -65,6 +67,9 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/_geoslib.so
 
 %changelog
+* Thu Dec 11 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.2-1
+- Update to latest release
+
 * Sat Nov 29 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.99-6
 - Rebuild for Python 2.6
 
diff --git a/sources b/sources
index 96012a3..3ff8e4b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-63a9b1ce245dea65b6f5f94c58930b30  basemap-0.99.1.tar.gz
+ba81a00fa77daf71cb27fca5f4c86fb9  basemap-0.99.2.tar.gz