rpms/python-basemap/devel python-basemap-0.99-setup.cfg.patch, NONE, 1.1 python-basemap-0.99-setup.patch, NONE, 1.1 .cvsignore, 1.10, 1.11 python-basemap.spec, 1.18, 1.19 sources, 1.10, 1.11 python-basemap-0.9.5-setup.patch, 1.3, NONE
Jef Spaleta (jspaleta)
fedora-extras-commits at redhat.com
Mon Jul 7 19:43:45 UTC 2008
- Previous message (by thread): rpms/kernel/devel patch-2.6.26-rc9-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.852, 1.853 kernel.spec, 1.736, 1.737 sources, 1.813, 1.814 upstream, 1.731, 1.732
- Next message (by thread): rpms/qt3/devel qt.csh,1.1,1.2 qt.sh,1.1,1.2 qt3.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jspaleta
Update of /cvs/pkgs/rpms/python-basemap/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3822
Modified Files:
.cvsignore python-basemap.spec sources
Added Files:
python-basemap-0.99-setup.cfg.patch
python-basemap-0.99-setup.patch
Removed Files:
python-basemap-0.9.5-setup.patch
Log Message:
* Wed Jul 02 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> 0.99-1
- Update to match latest matplotlib
python-basemap-0.99-setup.cfg.patch:
--- NEW FILE python-basemap-0.99-setup.cfg.patch ---
--- setup.cfg 2008-05-31 06:55:06.000000000 -0800
+++ setup.cfg.new 2008-07-02 14:20:55.000000000 -0800
@@ -6,5 +6,5 @@
# False: do not install
# auto: install only if the package is unavailable. This
# is the default behavior
-pydap = auto
-httplib2 = auto
+pydap = False
+httplib2 = False
python-basemap-0.99-setup.patch:
--- NEW FILE python-basemap-0.99-setup.patch ---
--- 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 @@
if GEOS_dir is None:
# if GEOS_dir not set, check a few standard locations.
- GEOS_dirs = ['/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
+ GEOS_dirs = ['/usr','/usr/local','/sw','/opt','/opt/local',os.path.expanduser('~')]
for direc in GEOS_dirs:
geos_version = checkversion(direc)
print 'checking for GEOS lib in %s ....' % direc
- if geos_version != '"2.2.3"':
+ if geos_version != '"3.0.0"':
+ print "geos_version mismatch",geos_version
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: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/.cvsignore,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- .cvsignore 28 Mar 2007 23:11:58 -0000 1.10
+++ .cvsignore 7 Jul 2008 19:42:56 -0000 1.11
@@ -1 +1 @@
-basemap-0.9.5.tgz
+basemap-0.99.tar.gz
Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- python-basemap.spec 19 Feb 2008 07:25:19 -0000 1.18
+++ python-basemap.spec 7 Jul 2008 19:42:56 -0000 1.19
@@ -1,18 +1,20 @@
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
Name: python-basemap
-Version: 0.9.5
-Release: 5%{?dist}
+Version: 0.99
+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}.tgz
-Patch0: python-basemap-0.9.5-setup.patch
+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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires: python-devel, proj-devel, shapelib-devel
-Requires: python-matplotlib >= 0.81, python-basemap-data
+BuildRequires: python-devel, proj-devel, shapelib-devel, numpy,geos-devel
+BuildRequires: python-httplib2
+Requires: python-matplotlib >= 0.98, python-basemap-data
%description
Basemap is a matplotlib toolkit that allows you to plot data on map
@@ -21,10 +23,12 @@
%prep
%setup -q -n basemap-%{version}
-%patch0 -p1 -b .orig
+%patch0 -p0
+%patch1 -p0
#Remove the bundled libraries
-mv src/_pyproj.c src/basemap_pycompat.h .
-rm -rf src pyshapelib/shapelib
+#mv src/_pyproj.c src/basemap_pycompat.h .
+#rm -rf src pyshapelib/shapelib
+#rm -rf src goes-2.2.3/
%build
@@ -46,16 +50,19 @@
%files
%defattr(-,root,root,-)
%doc Changelog README LICENSE_pyshapelib
-%{python_sitearch}/matplotlib/toolkits/basemap/
+%{python_sitearch}/mpl_toolkits/
%{python_sitearch}/dbflib/
%{python_sitearch}/dbflibc.so
%{python_sitearch}/shapelib/
%{python_sitearch}/shapelibc.so
%{python_sitearch}/shptree.so
%{python_sitearch}/*.egg-info
-
+%{python_sitearch}/_geoslib.so
%changelog
+* Wed Jul 02 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> 0.99-1
+- Update to match latest matplotlib
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 0.9.5-5
- Autorebuild for GCC 4.3
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/sources,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sources 28 Mar 2007 23:11:58 -0000 1.10
+++ sources 7 Jul 2008 19:42:56 -0000 1.11
@@ -1 +1 @@
-d214dc6a7201080a8e7419f2a5c8306b basemap-0.9.5.tgz
+362e7c130de689c877d82120732a24f9 basemap-0.99.tar.gz
--- python-basemap-0.9.5-setup.patch DELETED ---
- Previous message (by thread): rpms/kernel/devel patch-2.6.26-rc9-git2.bz2.sign, NONE, 1.1 .cvsignore, 1.852, 1.853 kernel.spec, 1.736, 1.737 sources, 1.813, 1.814 upstream, 1.731, 1.732
- Next message (by thread): rpms/qt3/devel qt.csh,1.1,1.2 qt.sh,1.1,1.2 qt3.spec,1.4,1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list