rpms/python-basemap/devel python-basemap-0.99-setup.patch, 1.2, 1.3 python-basemap.spec, 1.24, 1.25 sources, 1.11, 1.12

[Jef Spaleta]

Author: jspaleta

Update of /cvs/pkgs/rpms/python-basemap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32036

Modified Files:
	python-basemap-0.99-setup.patch python-basemap.spec sources 
Log Message:
* Thu Dec 11 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.2-1
- Update to latest release


python-basemap-0.99-setup.patch:

Index: python-basemap-0.99-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap-0.99-setup.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- python-basemap-0.99-setup.patch	19 Oct 2008 10:07:05 -0000	1.2
+++ python-basemap-0.99-setup.patch	12 Dec 2008 09:33:33 -0000	1.3
@@ -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')]
- 


Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- python-basemap.spec	29 Nov 2008 15:27:14 -0000	1.24
+++ python-basemap.spec	12 Dec 2008 09:33:34 -0000	1.25
@@ -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 @@
 
 %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 @@
 %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 @@
 %{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 at gmail.com> - 0.99-6
 - Rebuild for Python 2.6
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/sources,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- sources	7 Jul 2008 19:42:56 -0000	1.11
+++ sources	12 Dec 2008 09:33:34 -0000	1.12
@@ -1 +1 @@
-362e7c130de689c877d82120732a24f9  basemap-0.99.tar.gz
+63a9b1ce245dea65b6f5f94c58930b30  basemap-0.99.1.tar.gz