From 2b4f3d6f7c93babe91e2ae2809bda3b5d505c744 Mon Sep 17 00:00:00 2001
From: Denis Leroy <denis@fedoraproject.org>
Date: Dec 28 2006 12:03:09 +0000
Subject: Added patch to fix python 2.5 compile


---

diff --git a/glom-1.2.2-py25.patch b/glom-1.2.2-py25.patch
new file mode 100644
index 0000000..39c3764
--- /dev/null
+++ b/glom-1.2.2-py25.patch
@@ -0,0 +1,40 @@
+--- 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 */
+ };
diff --git a/glom.spec b/glom.spec
index 376f1fb..aea7624 100644
--- a/glom.spec
+++ b/glom.spec
@@ -11,6 +11,7 @@ License:        GPL
 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 @@ buttons. Glom uses the PostgreSQL database backend.
 %prep
 %setup -q
 %patch0 -p1 -b .poconfig
+%patch1 -p1 -b .py25
 
 
 %build
@@ -118,6 +120,7 @@ scrollkeeper-update -q || :
 %changelog
 * Mon Dec 11 2006 Denis Leroy <denis@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@poolshark.org> - 1.2.2-2
 - Fixed source upload