rpms/python-basemap/devel python-basemap-0.99-geos-3.0.1-runtime-check.patch, NONE, 1.1 python-basemap.spec, 1.22, 1.23
Kevin Kofler
kkofler at fedoraproject.org
Thu Oct 23 01:44:51 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/python-basemap/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14405/devel
Modified Files:
python-basemap.spec
Added Files:
python-basemap-0.99-geos-3.0.1-runtime-check.patch
Log Message:
* Thu Oct 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.99-5
- Also patch runtime GEOS version check (as discussed on the fedora-devel-list)
python-basemap-0.99-geos-3.0.1-runtime-check.patch:
--- NEW FILE python-basemap-0.99-geos-3.0.1-runtime-check.patch ---
diff -ur basemap-0.99/src/_geoslib.c basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c
--- basemap-0.99/src/_geoslib.c 2008-05-31 16:47:47.000000000 +0200
+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.c 2008-10-23 03:39:39.000000000 +0200
@@ -202,8 +202,8 @@
/* Implementation of _geoslib */
static char __pyx_k_3[] = "0.1";
-static char __pyx_k_4[] = "2.2.3-CAPI-1.1.1";
-static char __pyx_k_5[] = "version 2.2.3 of the geos library is required";
+static char __pyx_k_4[] = "3.0.1-CAPI-1.4.2";
+static char __pyx_k_5[] = "version 3.0.1 of the geos library is required";
static PyObject *__pyx_n_is_valid;
static PyObject *__pyx_n_geom_type;
@@ -515,7 +515,7 @@
* cdef geos_version():
* return PyString_FromString(GEOSversion()) # <<<<<<<<<<<<<<
* __geos_version__ = geos_version() # module variable.
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
*/
__pyx_1 = PyString_FromString(GEOSversion()); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 120; __pyx_clineno = __LINE__; goto __pyx_L1;}
__pyx_r = __pyx_1;
@@ -2988,8 +2988,8 @@
* cdef geos_version():
* return PyString_FromString(GEOSversion())
* __geos_version__ = geos_version() # module variable. # <<<<<<<<<<<<<<
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
- * raise ValueError('version 2.2.3 of the geos library is required')
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
+ * raise ValueError('version 3.0.1 of the geos library is required')
*/
__pyx_1 = __pyx_f_8_geoslib_geos_version(); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
if (PyObject_SetAttr(__pyx_m, __pyx_n___geos_version__, __pyx_1) < 0) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 121; __pyx_clineno = __LINE__; goto __pyx_L1;}
@@ -2998,8 +2998,8 @@
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":122
* return PyString_FromString(GEOSversion())
* __geos_version__ = geos_version() # module variable.
- * if __geos_version__ != "2.2.3-CAPI-1.1.1": # <<<<<<<<<<<<<<
- * raise ValueError('version 2.2.3 of the geos library is required')
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2": # <<<<<<<<<<<<<<
+ * raise ValueError('version 3.0.1 of the geos library is required')
* # intialize GEOS (parameters are notice and error function callbacks).
*/
__pyx_1 = __Pyx_GetName(__pyx_m, __pyx_n___geos_version__); if (unlikely(!__pyx_1)) {__pyx_filename = __pyx_f[0]; __pyx_lineno = 122; __pyx_clineno = __LINE__; goto __pyx_L1;}
@@ -3011,8 +3011,8 @@
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":123
* __geos_version__ = geos_version() # module variable.
- * if __geos_version__ != "2.2.3-CAPI-1.1.1":
- * raise ValueError('version 2.2.3 of the geos library is required') # <<<<<<<<<<<<<<
+ * if __geos_version__ != "3.0.1-CAPI-1.4.2":
+ * raise ValueError('version 3.0.1 of the geos library is required') # <<<<<<<<<<<<<<
* # intialize GEOS (parameters are notice and error function callbacks).
* initGEOS(notice_h, error_h)
*/
@@ -3029,7 +3029,7 @@
__pyx_L5:;
/* "/Volumes/User/jwhitaker/matplotlib/basemap/src/_geoslib.pyx":125
- * raise ValueError('version 2.2.3 of the geos library is required')
+ * raise ValueError('version 3.0.1 of the geos library is required')
* # intialize GEOS (parameters are notice and error function callbacks).
* initGEOS(notice_h, error_h) # <<<<<<<<<<<<<<
*
diff -ur basemap-0.99/src/_geoslib.pyx basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx
--- basemap-0.99/src/_geoslib.pyx 2008-05-31 16:47:47.000000000 +0200
+++ basemap-0.99-geos-3.0.1-runtime-check/src/_geoslib.pyx 2008-10-23 03:38:50.000000000 +0200
@@ -119,8 +119,8 @@
cdef geos_version():
return PyString_FromString(GEOSversion())
__geos_version__ = geos_version() # module variable.
-if __geos_version__ != "2.2.3-CAPI-1.1.1":
- raise ValueError('version 2.2.3 of the geos library is required')
+if __geos_version__ != "3.0.1-CAPI-1.4.2":
+ raise ValueError('version 3.0.1 of the geos library is required')
# intialize GEOS (parameters are notice and error function callbacks).
initGEOS(notice_h, error_h)
Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/devel/python-basemap.spec,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- python-basemap.spec 19 Oct 2008 10:07:05 -0000 1.22
+++ python-basemap.spec 23 Oct 2008 01:44:21 -0000 1.23
@@ -2,14 +2,17 @@
Name: python-basemap
Version: 0.99
-Release: 4%{?dist}
+Release: 5%{?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
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, proj-devel, shapelib-devel, numpy,geos-devel
@@ -25,6 +28,7 @@
%setup -q -n basemap-%{version}
%patch0 -p0
%patch1 -p0
+%patch2 -p1
#Remove the bundled libraries
#mv src/_pyproj.c src/basemap_pycompat.h .
#rm -rf src pyshapelib/shapelib
@@ -61,6 +65,9 @@
%{python_sitearch}/_geoslib.so
%changelog
+* Thu Oct 23 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.99-5
+- Also patch runtime GEOS version check (as discussed on the fedora-devel-list)
+
* Sun Oct 19 2008 Alex Lancaster <alexlan[AT]fedoraproject org> - 0.99-4
- Update -setup.py patch for geos 3.0.1
More information about the scm-commits
mailing list