rpms/glom/devel glom-1.2.2-py25.patch,NONE,1.1 glom.spec,1.8,1.9

[Denis Leroy (denis)]

Author: denis

Update of /cvs/extras/rpms/glom/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21054

Modified Files:
	glom.spec 
Added Files:
	glom-1.2.2-py25.patch 
Log Message:
Added patch to fix python 2.5 compile

glom-1.2.2-py25.patch:

--- NEW FILE glom-1.2.2-py25.patch ---
--- glom-1.2.2/glom/libglom/python_embed/py_glom_record.cc.orig	2006-12-28 12:46:59.000000000 +0100
+++ glom-1.2.2/glom/libglom/python_embed/py_glom_record.cc	2006-12-28 12:48:06.000000000 +0100
@@ -170,7 +170,7 @@
 
 
 
-static int
+static Py_ssize_t
 Record_tp_as_mapping_length(PyGlomRecord *self)
 {
   return self->m_pMap_field_values->size();
@@ -228,7 +228,7 @@
 */
 
 static PyMappingMethods Record_tp_as_mapping = {
-    (inquiry)Record_tp_as_mapping_length,
+    (lenfunc)Record_tp_as_mapping_length,
     (binaryfunc)Record_tp_as_mapping_getitem,
     (objobjargproc)0 /* Record_tp_as_mapping_setitem */
 };
--- glom-1.2.2/glom/libglom/python_embed/py_glom_related.cc.orig	2006-12-28 12:46:59.000000000 +0100
+++ glom-1.2.2/glom/libglom/python_embed/py_glom_related.cc	2006-12-28 12:47:40.000000000 +0100
@@ -102,7 +102,7 @@
 }
 
 
-static int
+static Py_ssize_t
 Related_tp_as_mapping_length(PyGlomRelated *self)
 {
   return self->m_pMap_relationships->size();
@@ -188,7 +188,7 @@
 */
 
 static PyMappingMethods Related_tp_as_mapping = {
-    (inquiry)Related_tp_as_mapping_length,
+    (lenfunc)Related_tp_as_mapping_length,
     (binaryfunc)Related_tp_as_mapping_getitem,
     (objobjargproc)0 /* Related_tp_as_mapping_setitem */
 };


Index: glom.spec
===================================================================
RCS file: /cvs/extras/rpms/glom/devel/glom.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- glom.spec	11 Dec 2006 15:51:10 -0000	1.8
+++ glom.spec	28 Dec 2006 12:03:09 -0000	1.9
@@ -11,6 +11,7 @@
 URL:            http://www.glom.org/
 Source0:        http://ftp.gnome.org/pub/GNOME/sources/glom/%{major_version}/%{name}-%{major_version}.%{minor_version}.tar.bz2
 Patch0:         glom-1.0.5-poconfig.patch
+Patch1:         glom-1.2.2-py25.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  bakery-devel >= 2.4
@@ -52,6 +53,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .poconfig
+%patch1 -p1 -b .py25
 
 
 %build
@@ -118,6 +120,7 @@
 %changelog
 * Mon Dec 11 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-3
 - Fixed python2.5 path
+- Added patch to fix python 2.5 compile
 
 * Fri Dec  8 2006 Denis Leroy <denis at poolshark.org> - 1.2.2-2
 - Fixed source upload