From 8502a78f8099a701f0b84d316e5c011b40b7b5ea Mon Sep 17 00:00:00 2001
From: Denis Leroy <denis@fedoraproject.org>
Date: Mar 15 2007 15:17:09 +0000
Subject: Update to 1.4.0


---

diff --git a/.cvsignore b/.cvsignore
index 471d27b..4dc19fb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-glom-1.3.11.tar.bz2
+glom-1.4.0.tar.bz2
diff --git a/glom-1.0.5-poconfig.patch b/glom-1.0.5-poconfig.patch
deleted file mode 100644
index ca9840d..0000000
--- a/glom-1.0.5-poconfig.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- glom-1.0.5/configure.in.orig	2006-10-04 19:32:11.000000000 -0700
-+++ glom-1.0.5/configure.in	2006-10-04 19:32:24.000000000 -0700
-@@ -21,6 +21,7 @@
- 		   [The domain name to use with gettext.])
- 
- ALL_LINGUAS="ca cs de en_CA en_GB es fi fr gu hu it nb ne nl pa pt pt_BR rw sq sv tr vi zh_CN"
-+AC_SUBST(ALL_LINGUAS)
- 
- AM_GLIB_GNU_GETTEXT
- IT_PROG_INTLTOOL([0.35.0])
diff --git a/glom-1.2.2-py25.patch b/glom-1.2.2-py25.patch
deleted file mode 100644
index 0ed3c4d..0000000
--- a/glom-1.2.2-py25.patch
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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 */
- };
---- glom-1.2.2/glom/libglom/python_embed/py_glom_relatedrecord.cc.orig	2006-12-28 12:46:59.000000000 +0100
-+++ glom-1.2.2/glom/libglom/python_embed/py_glom_relatedrecord.cc	2006-12-28 13:26:01.000000000 +0100
-@@ -140,7 +140,7 @@
- */
- 
- 
--static int
-+static Py_ssize_t
- RelatedRecord_tp_as_mapping_length(PyGlomRelatedRecord *self)
- {
-   return self->m_pMap_field_values->size();
-@@ -237,7 +237,7 @@
- */
- 
- static PyMappingMethods RelatedRecord_tp_as_mapping = {
--    (inquiry)RelatedRecord_tp_as_mapping_length,
-+    (lenfunc)RelatedRecord_tp_as_mapping_length,
-     (binaryfunc)RelatedRecord_tp_as_mapping_getitem,
-     (objobjargproc)0 /* RelatedRecord_tp_as_mapping_setitem */
- };
diff --git a/glom.spec b/glom.spec
index 52a5a13..302187a 100644
--- a/glom.spec
+++ b/glom.spec
@@ -1,5 +1,5 @@
-%define major_version  1.3
-%define minor_version  11
+%define major_version  1.4
+%define minor_version  0
 
 Name:           glom
 Version:        %{major_version}.%{minor_version}
@@ -122,6 +122,9 @@ scrollkeeper-update -q || :
 
 
 %changelog
+* Thu Mar 15 2007 Denis Leroy <denis@poolshark.org> - 1.4.0-1
+- Update to 1.4.0
+
 * Fri Mar  9 2007 Denis Leroy <denis@poolshark.org> - 1.3.11-1
 - Update to 1.3.11
 - Updated dependencies, added postgres deps
diff --git a/sources b/sources
index 713d4b8..4397e33 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-911d4e88ae53a1be50d2f65bbda96cf5  glom-1.3.11.tar.bz2
+b3bf9606498995ee7df7dd6c5dfdf65c  glom-1.4.0.tar.bz2