rpms/python-basemap/EL-6 .cvsignore, 1.12, 1.13 python-basemap-0.99-datadir.patch, 1.1, 1.2 python-basemap.spec, 1.31, 1.32 sources, 1.13, 1.14 python-basemap-0.99-setup.cfg.patch, 1.1, NONE python-basemap-0.99-setup.patch, 1.3, NONE

Wed Jul 7 20:15:28 UTC 2010

Author: mdomsch

Update of /cvs/pkgs/rpms/python-basemap/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32703

Modified Files:
	.cvsignore python-basemap-0.99-datadir.patch 
	python-basemap.spec sources 
Removed Files:
	python-basemap-0.99-setup.cfg.patch 
	python-basemap-0.99-setup.patch 
Log Message:
update to 0.99.4 from devel branch


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/EL-6/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13

--- .cvsignore	12 Dec 2008 17:48:36 -0000	1.12
+++ .cvsignore	7 Jul 2010 20:15:26 -0000	1.13
@@ -1 +1,2 @@
-basemap-0.99.2.tar.gz
+basemap-0.99.4.tar.gz
+basemap-0.99.4-examples.tar.gz

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/EL-6/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	7 Jul 2010 20:15:27 -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/EL-6/python-basemap.spec,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -p -r1.31 -r1.32
--- python-basemap.spec	7 Apr 2010 18:25:28 -0000	1.31
+++ python-basemap.spec	7 Jul 2010 20:15:27 -0000	1.32
@@ -1,13 +1,14 @@
 %{!?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:        7%{?dist}
+Version:        0.99.4
+Release:        8%{?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
+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
 #Patch0:         python-basemap-0.99-setup.cfg.patch
 #Patch1:         python-basemap-0.99-setup.patch
 Patch2:         python-basemap-0.99-datadir.patch
@@ -21,12 +22,20 @@ Requires:       python-matplotlib >= 0.9
 Basemap is a matplotlib toolkit that allows you to plot data on map
 projections (with continental and political boundaries).
 
+%package -n     python-basemap-examples
+Summary:        Example programs and data for python-basemap
+Group:          Development/Libraries
+License:        Copyright only
+Requires:       python-basemap
+
+%description -n python-basemap-examples
+%{summary}.
 
 %prep
 %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
@@ -66,12 +75,38 @@ rm -rf $RPM_BUILD_ROOT
 %{python_sitearch}/*.egg-info
 %{python_sitearch}/_geoslib.so
 
+%files -n python-basemap-examples
+%defattr(-,root,root,-)
+%doc examples/*
+
 %changelog
-* Wed Apr  7 2010 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99.2-7
-- Rebuild against new GEOS.
+* Thu Jun 03 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-8
+- update the homepage url 
+
+* Fri May 28 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-7
+- Examples is now a subpackage of python-basemap instead of python-basemap-data 
+
+* 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
+- Added back the data directory patch. It is needed to correctly set the 
+  default location of system data files provided by the python-basemap-data 
+  package.  Setting the environment variable at build time is not sufficient 
+  to set the correct system-wide location for distribution packaging.  
+
+* Thu Apr 01 2010 Jef Spaleta <jspaleta at fedoraproject.org> - 0.99.4-3
+- Rebuild to fix numpy ABI change.
+
+* Fri Jan 08 2010 Jon Ciesla <limb at jcomserv.net> - 0.99.4-2
+- Rebuild for broken dep.
 
-* Wed Jan 13 2010 Devrim GÜNDÜZ <devrim at gunduz.org> - 0.99.2-6
-- Rebuild against new GEOS.
+* Fri Dec 11 2009 Jon Ciesla <limb at jcomserv.net> - 0.99.4-1
+- Update to latest upstream.
+- Dropped datadir patch, now handled with environment variable.
 
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.99.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/EL-6/sources,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sources	12 Dec 2008 10:25:18 -0000	1.13
+++ sources	7 Jul 2010 20:15:27 -0000	1.14
@@ -1 +1,2 @@
-ba81a00fa77daf71cb27fca5f4c86fb9  basemap-0.99.2.tar.gz
+07fe1a01c321c43db4739c18e99d4d44  basemap-0.99.4.tar.gz
+3700f4d59b9b01e33db30b7c83f69071  basemap-0.99.4-examples.tar.gz


--- python-basemap-0.99-setup.cfg.patch DELETED ---


--- python-basemap-0.99-setup.patch DELETED ---

