rpms/python-basemap/F-10 python-basemap-0.99-geos-3.0.3-runtime-check.patch, NONE, 1.1 python-basemap-0.99-setup.patch, 1.2, 1.3 python-basemap.spec, 1.23, 1.24
Jef Spaleta
jspaleta at fedoraproject.org
Wed Dec 10 01:25:42 UTC 2008
Author: jspaleta
Update of /cvs/pkgs/rpms/python-basemap/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1768
Modified Files:
python-basemap-0.99-setup.patch python-basemap.spec
Added Files:
python-basemap-0.99-geos-3.0.3-runtime-check.patch
Log Message:
* Tue Dec 9 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99-6
- Patch and rebuild for geos 3.0.3 update
python-basemap-0.99-geos-3.0.3-runtime-check.patch:
--- NEW FILE python-basemap-0.99-geos-3.0.3-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.3-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)
python-basemap-0.99-setup.patch:
Index: python-basemap-0.99-setup.patch
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/F-10/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 10 Dec 2008 01:25:11 -0000 1.3
@@ -10,7 +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"':
++ if geos_version != '"3.0.3"':
+ print "geos_version mismatch",geos_version
continue
else:
Index: python-basemap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-basemap/F-10/python-basemap.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- python-basemap.spec 23 Oct 2008 01:44:21 -0000 1.23
+++ python-basemap.spec 10 Dec 2008 01:25:11 -0000 1.24
@@ -2,7 +2,7 @@
Name: python-basemap
Version: 0.99
-Release: 5%{?dist}
+Release: 6%{?dist}
Summary: Plots data on map projections (with continental and political boundaries)
Group: Development/Libraries
License: LGPLv2+
@@ -12,7 +12,7 @@
# 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
+Patch2: python-basemap-0.99-geos-3.0.3-runtime-check.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: python-devel, proj-devel, shapelib-devel, numpy,geos-devel
@@ -65,6 +65,9 @@
%{python_sitearch}/_geoslib.so
%changelog
+* Tue Dec 9 2008 Jef Spaleta <jspaleta AT fedoraproject DOT org> - 0.99-6
+- Patch and rebuild for geos 3.0.3 update
+
* 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)
More information about the fedora-extras-commits
mailing list