[libguestfs/el5/master] Backport missed patch which fixes build on old Python 2.4 in RHEL 5.

[Richard W.M. Jones]

commit 2a2c0aea43f32cc0117022e743363fb2f7606548
Author: Richard Jones <rjones at redhat.com>
Date:   Tue Aug 17 19:01:07 2010 +0100

    Backport missed patch which fixes build on old Python 2.4 in RHEL 5.

 ...uestfs-1.2.11-build-workaround-python-2.4.patch |   21 +++++++++++--------
 libguestfs.spec                                    |    4 +-
 2 files changed, 14 insertions(+), 11 deletions(-)
---
diff --git a/libguestfs-1.2.11-build-workaround-python-2.4.patch b/libguestfs-1.2.11-build-workaround-python-2.4.patch
index 8d34f42..8c30677 100644
--- a/libguestfs-1.2.11-build-workaround-python-2.4.patch
+++ b/libguestfs-1.2.11-build-workaround-python-2.4.patch
@@ -1,21 +1,21 @@
+From f55864b828abd1bbfebc0a5fcf96057d46b1a760 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones at redhat.com>
-Date: Fri, 21 May 2010 17:20:28 +0000 (+0100)
-Subject: Build workaround for Python 2.4.x in RHEL 5.
-X-Git-Tag: 1.3.14~4
-X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=012b1c71f4eda3ae779da51d7d81c199d90f667d
-
-Build workaround for Python 2.4.x in RHEL 5.
+Date: Fri, 21 May 2010 18:20:28 +0100
+Subject: [PATCH] Build workaround for Python 2.4.x in RHEL 5.
 
 See:
 http://www.python.org/dev/peps/pep-0353/#conversion-guidelines
+(cherry picked from commit 012b1c71f4eda3ae779da51d7d81c199d90f667d)
 ---
+ src/generator.ml |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/src/generator.ml b/src/generator.ml
-index d2da8ec..1212a5a 100755
+index 116fb01..4b7313b 100755
 --- a/src/generator.ml
 +++ b/src/generator.ml
-@@ -9113,6 +9113,12 @@ and generate_python_c () =
- #define PY_SSIZE_T_CLEAN 1
+@@ -8784,6 +8784,12 @@ and generate_python_c () =
+   pr "\
  #include <Python.h>
  
 +#if PY_VERSION_HEX < 0x02050000
@@ -27,3 +27,6 @@ index d2da8ec..1212a5a 100755
  #include <stdio.h>
  #include <stdlib.h>
  #include <assert.h>
+-- 
+1.7.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index ce3c041..0a3c390 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -42,7 +42,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.2.11
-Release:       1.1%{?dist}
+Release:       1.2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -703,7 +703,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Tue Aug 17 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.11-1.1
+* Tue Aug 17 2010 Richard W.M. Jones <rjones at redhat.com> - 1:1.2.11-1.2
 - New stable branch version 1.2.11.
 - Backport missed patch which fixes build on old Python 2.4 in RHEL 5.