diff --git a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
index bbf442c..45bc8b5 100644
--- a/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
+++ b/0001-EPEL-5-Remove-checks-which-fail-with-ancient-qemu.patch
@@ -1,7 +1,7 @@
 From 0ac56223f3bdda38007ec11b15992e16f29915b2 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:19:39 +0100
-Subject: [PATCH 01/35] EPEL 5: Remove checks which fail with ancient qemu.
+Subject: [PATCH 01/36] EPEL 5: Remove checks which fail with ancient qemu.
 
 Note that g->app.qemu_version and g->app.qemu_devices will both
 be empty strings.
diff --git a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
index f5713d0..1c88444 100644
--- a/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
+++ b/0002-EPEL-5-Remove-AS_ECHO_N-for-ancient-autoconf.patch
@@ -1,7 +1,7 @@
 From 8a00cc50640d2eb08c31f0807d722ce163871a2c Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:23:19 +0100
-Subject: [PATCH 02/35] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
+Subject: [PATCH 02/36] EPEL 5: Remove AS_ECHO_N for ancient autoconf.
 
 ---
  configure.ac |   28 ++++++++++++++--------------
diff --git a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
index 1b134c4..51dcaa7 100644
--- a/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
+++ b/0003-EPEL-5-Replace-macro-AC_STRUCT_DIRENT_D_TYPE-for-anc.patch
@@ -1,7 +1,7 @@
 From 9871e1d5255c6d15cea3832767bf90e3f47c4d18 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 10:46:20 +0100
-Subject: [PATCH 03/35] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
+Subject: [PATCH 03/36] EPEL 5: Replace macro AC_STRUCT_DIRENT_D_TYPE for ancient autoconf.
 
 ---
  configure.ac |    2 +-
diff --git a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
index 563c9d3..0383dcf 100644
--- a/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
+++ b/0004-EPEL-5-Don-t-use-C99-style-variable-decls-in-for-loo.patch
@@ -1,7 +1,7 @@
 From c8f8e45763bc22912b41a4180ba5033e568b380f Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 13:55:44 +0100
-Subject: [PATCH 04/35] EPEL 5: Don't use C99-style variable decls in for-loop.
+Subject: [PATCH 04/36] EPEL 5: Don't use C99-style variable decls in for-loop.
 
 ---
  daemon/btrfs.c         |    3 ++-
diff --git a/0005-EPEL-5-Remove-Erlang-bindings.patch b/0005-EPEL-5-Remove-Erlang-bindings.patch
index fdaf50a..72dc60b 100644
--- a/0005-EPEL-5-Remove-Erlang-bindings.patch
+++ b/0005-EPEL-5-Remove-Erlang-bindings.patch
@@ -1,7 +1,7 @@
 From 68ef51fac452cfac5864b3524c41ce57104e31d5 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 14:34:25 +0100
-Subject: [PATCH 05/35] EPEL 5: Remove Erlang bindings.
+Subject: [PATCH 05/36] EPEL 5: Remove Erlang bindings.
 
 ---
  Makefile.am  |    3 ---
diff --git a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
index 424a51b..7965a79 100644
--- a/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
+++ b/0006-EPEL-5-Remove-GObject-GObject-Introspection-GJS-bind.patch
@@ -1,7 +1,7 @@
 From 3772113b6a431974abaed1cabc1b055881193938 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 16 Jun 2012 14:35:06 +0100
-Subject: [PATCH 06/35] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
+Subject: [PATCH 06/36] EPEL 5: Remove GObject / GObject Introspection / GJS bindings.
 
 ---
  Makefile.am  |    3 --
diff --git a/0007-EPEL-5-Remove-PHP-bindings.patch b/0007-EPEL-5-Remove-PHP-bindings.patch
index 13eb278..e65dee2 100644
--- a/0007-EPEL-5-Remove-PHP-bindings.patch
+++ b/0007-EPEL-5-Remove-PHP-bindings.patch
@@ -1,7 +1,7 @@
 From 21943f8c165ce6a971d063fe7bed474a3271aed9 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 23:01:43 +0100
-Subject: [PATCH 07/35] EPEL 5: Remove PHP bindings.
+Subject: [PATCH 07/36] EPEL 5: Remove PHP bindings.
 
 ---
  Makefile.am  |    3 ---
diff --git a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
index b63cb46..0ba0a43 100644
--- a/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
+++ b/0008-EPEL-5-Define-le64toh-le32toh-if-not-defined.patch
@@ -1,7 +1,7 @@
 From 8bf1fe18c7c28e6d8a31be83be4d553956a6628f Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 22:17:06 +0100
-Subject: [PATCH 08/35] EPEL 5: Define le64toh, le32toh if not defined.
+Subject: [PATCH 08/36] EPEL 5: Define le64toh, le32toh if not defined.
 
 ---
  src/inspect-fs-windows.c |   16 ++++++++++++++++
diff --git a/0009-EPEL-5-Add-gnulib-utimensat-module.patch b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
index 1eb31e7..703e184 100644
--- a/0009-EPEL-5-Add-gnulib-utimensat-module.patch
+++ b/0009-EPEL-5-Add-gnulib-utimensat-module.patch
@@ -1,7 +1,7 @@
 From 62c4d0423fcffee04c0016865787f6f614d6f304 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 22:58:58 +0100
-Subject: [PATCH 09/35] EPEL 5: Add gnulib utimensat module.
+Subject: [PATCH 09/36] EPEL 5: Add gnulib utimensat module.
 
 This function is missing in RHEL 5-era kernels.
 ---
diff --git a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
index f147fa5..99e78b1 100644
--- a/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
+++ b/0010-EPEL-5-Old-ocamlopt-didn-t-support-debugging-g-optio.patch
@@ -1,7 +1,7 @@
 From 5d03f944054585f0117af4c85584e0f15f1ff4cc Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sun, 17 Jun 2012 23:00:16 +0100
-Subject: [PATCH 10/35] EPEL 5: Old ocamlopt didn't support debugging (-g option).
+Subject: [PATCH 10/36] EPEL 5: Old ocamlopt didn't support debugging (-g option).
 
 ---
  ocaml/Makefile.am    |    2 +-
diff --git a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
index 1d4efbf..f82a819 100644
--- a/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
+++ b/0011-EPEL-5-Replace-format6-with-format4-in-OCaml-gettext.patch
@@ -1,7 +1,7 @@
 From fdc5c9eeaccf9c3f25d3a5d943fbbf08ef936233 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 08:35:14 +0100
-Subject: [PATCH 11/35] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
+Subject: [PATCH 11/36] EPEL 5: Replace format6 with format4 in OCaml gettext routines.
 
 ---
  configure.ac |   10 +++++-----
diff --git a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
index f3bf45a..3ae8797 100644
--- a/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
+++ b/0012-EPEL-5-Pass-preserve-dup-deps-explicitly-to-libtool.patch
@@ -1,7 +1,7 @@
 From 2ae8a1ffcb8af8902a7e7ed57cdb3d6055a78d83 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 12:18:35 +0100
-Subject: [PATCH 12/35] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
+Subject: [PATCH 12/36] EPEL 5: Pass --preserve-dup-deps explicitly to libtool.
 
 See this thread:
 https://lists.gnu.org/archive/html/bug-gnulib/2012-06/msg00162.html
diff --git a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
index 396308e..40db0c5 100644
--- a/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
+++ b/0013-EPEL-5-Remove-id-from-drive-parameter-on-qemu-comman.patch
@@ -1,7 +1,7 @@
 From 10a6018ca0a019920629591d82d60a433b882b17 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 17:21:30 +0100
-Subject: [PATCH 13/35] EPEL 5: Remove id= from -drive parameter on qemu command line.
+Subject: [PATCH 13/36] EPEL 5: Remove id= from -drive parameter on qemu command line.
 
 ---
  src/launch-appliance.c |    5 ++---
diff --git a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
index 19600e2..7e6649a 100644
--- a/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
+++ b/0014-EPEL-5-Add-null-vmchannel-back-for-qemu-without-virt.patch
@@ -1,7 +1,7 @@
 From 52af6f30a0efc4990ea2302e2467851af3ffd61d Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 18 Jun 2012 16:06:34 +0100
-Subject: [PATCH 14/35] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
+Subject: [PATCH 14/36] EPEL 5: Add "null vmchannel" back for qemu without virtio-serial support.
 
 ---
  appliance/init         |    4 +-
diff --git a/0015-EPEL-5-Disable-libvirt-attach-method.patch b/0015-EPEL-5-Disable-libvirt-attach-method.patch
index 569c916..25349e0 100644
--- a/0015-EPEL-5-Disable-libvirt-attach-method.patch
+++ b/0015-EPEL-5-Disable-libvirt-attach-method.patch
@@ -1,7 +1,7 @@
 From a447dcd5b5131cde034d6a2a9e26e3a27eca9689 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 17:57:46 +0100
-Subject: [PATCH 15/35] EPEL 5: Disable libvirt attach method.
+Subject: [PATCH 15/36] EPEL 5: Disable libvirt attach method.
 
 ---
  src/launch-libvirt.c |    2 +-
diff --git a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
index 13251b0..02c015e 100644
--- a/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
+++ b/0016-EPEL-5-Fix-blkid-to-return-LVM2_member-for-PVs.patch
@@ -1,7 +1,7 @@
 From ebb923ed81316ba931ec74cd81a4b23e739e5e92 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 10:06:47 +0100
-Subject: [PATCH 16/35] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
+Subject: [PATCH 16/36] EPEL 5: Fix blkid to return "LVM2_member" for PVs.
 
 Old blkid in RHEL 5 didn't return the right thing for PVs.
 ---
diff --git a/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch b/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
index ae5bfb1..4187551 100644
--- a/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
+++ b/0017-EPEL-5-sparsify-Fix-command-line-options-for-old-qem.patch
@@ -1,7 +1,7 @@
 From 962689dedb6356c0f04a9eaaf1d23835ed8a2283 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 10:24:48 +0100
-Subject: [PATCH 17/35] EPEL 5: sparsify: Fix command line options for old qemu-img.
+Subject: [PATCH 17/36] EPEL 5: sparsify: Fix command line options for old qemu-img.
 
 This didn't have -o backing_file etc.  Use old -b and -F options instead.
 ---
diff --git a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
index 2a3d932..1ee7e67 100644
--- a/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
+++ b/0018-EPEL-5-Remove-Fedora-MD-test-images.patch
@@ -1,7 +1,7 @@
 From 98d5a48143b0d409ac76fc6c6e15fdef2cc33b65 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 13:15:49 +0100
-Subject: [PATCH 18/35] EPEL 5: Remove Fedora MD test images.
+Subject: [PATCH 18/36] EPEL 5: Remove Fedora MD test images.
 
 On RHEL 5, mdadm is not able to create md devices with aliases,
 eg. '/dev/md/boot'.
diff --git a/0019-EPEL-5-Add-mkisofs-to-package-list.patch b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
index 12df643..6614da6 100644
--- a/0019-EPEL-5-Add-mkisofs-to-package-list.patch
+++ b/0019-EPEL-5-Add-mkisofs-to-package-list.patch
@@ -1,7 +1,7 @@
 From bb99ad810f2535c1a78871de4cb2831f110593e4 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 14:46:43 +0100
-Subject: [PATCH 19/35] EPEL 5: Add mkisofs to package list.
+Subject: [PATCH 19/36] EPEL 5: Add mkisofs to package list.
 
 This package contains the 'isoinfo' program which is required
 to implement the corresponding API and for tests to pass.
diff --git a/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch b/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
index b1a7b8b..d6aab47 100644
--- a/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
+++ b/0020-EPEL-5-Add-1-second-pause-after-unmounting-any-files.patch
@@ -1,7 +1,7 @@
 From f3dd167b8801d5eb05958205556b1092a196368b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 22 Jun 2012 21:58:32 +0100
-Subject: [PATCH 20/35] EPEL 5: Add 1 second pause after unmounting any filesystem.
+Subject: [PATCH 20/36] EPEL 5: Add 1 second pause after unmounting any filesystem.
 
 This fixes the test-charset-fidelity test case.  A simpler example
 which fails without this is:
diff --git a/0021-EPEL-5-podwrapper-Remove-HTML-output.patch b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
index 1efbe6e..13b739d 100644
--- a/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
+++ b/0021-EPEL-5-podwrapper-Remove-HTML-output.patch
@@ -1,7 +1,7 @@
 From 257c8f7a07fc0b5fcbc19260e643bf753a49ce76 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:01:00 +0100
-Subject: [PATCH 21/35] EPEL 5: podwrapper: Remove HTML output.
+Subject: [PATCH 21/36] EPEL 5: podwrapper: Remove HTML output.
 
 It requires perl Pod::Simple::XHTML which did not exist in
 RHEL 5 era.
diff --git a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch b/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
index 985e7fd..5cab0a0 100644
--- a/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
+++ b/0022-EPEL-5-podwrapper-Don-t-use-Pod-Man.patch
@@ -1,7 +1,7 @@
 From 32705d2e9a13cfb248b4db1ad8b7349ed465f914 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:16:18 +0100
-Subject: [PATCH 22/35] EPEL 5: podwrapper: Don't use Pod::Man.
+Subject: [PATCH 22/36] EPEL 5: podwrapper: Don't use Pod::Man.
 
 This unfortunately means the man pages are generated as plain text.
 However that's necessary as Pod::Man does not have an output_string
diff --git a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
index dc6d0a1..cb0b9f0 100644
--- a/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
+++ b/0023-EPEL-5-Revert-Mac-OS-X-Use-libtool-mode-execute-inst.patch
@@ -1,7 +1,7 @@
 From 9f4d530ca5e1cba66039ae25e2472fcebb3bb916 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Thu, 30 Aug 2012 18:19:28 +0100
-Subject: [PATCH 23/35] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
+Subject: [PATCH 23/36] EPEL 5: Revert "Mac OS X: Use libtool --mode=execute instead of LD_LIBRARY_PATH"
 
 This reverts commit 61c9ea496e0579bb7d1bcf496595d66c3f08cfec.
 ---
diff --git a/0024-EPEL-5-Don-t-use-sgabios.patch b/0024-EPEL-5-Don-t-use-sgabios.patch
index 1bb3d0d..ca24df4 100644
--- a/0024-EPEL-5-Don-t-use-sgabios.patch
+++ b/0024-EPEL-5-Don-t-use-sgabios.patch
@@ -1,7 +1,7 @@
 From 1810496e8aa5ff35b8ec5acd3ae64ff7635154b3 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 10:24:06 +0100
-Subject: [PATCH 24/35] EPEL 5: Don't use sgabios.
+Subject: [PATCH 24/36] EPEL 5: Don't use sgabios.
 
 Old qemu doesn't support '-device' parameter.
 ---
diff --git a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
index 5a23455..c3db6d9 100644
--- a/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
+++ b/0025-EPEL-5-Revert-daemon-Remove-e2prog-hack-only-needed-.patch
@@ -1,7 +1,7 @@
 From a46b654e1052506abb81bc1678ed55bfc0175202 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 13:48:18 +0100
-Subject: [PATCH 25/35] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
+Subject: [PATCH 25/36] EPEL 5: Revert "daemon: Remove e2prog hack (only needed for RHEL 5)."
 
 This reverts commit 163e030ee13644ad9efe1e078aff47b879657333.
 ---
diff --git a/0026-EPEL-5-Disable-tar-xz-test.patch b/0026-EPEL-5-Disable-tar-xz-test.patch
index 1375b42..735cef5 100644
--- a/0026-EPEL-5-Disable-tar-xz-test.patch
+++ b/0026-EPEL-5-Disable-tar-xz-test.patch
@@ -1,7 +1,7 @@
 From 6c13992cc7e40319eed96365f04e2873516ba19f Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 14:59:25 +0100
-Subject: [PATCH 26/35] EPEL 5: Disable tar --xz test.
+Subject: [PATCH 26/36] EPEL 5: Disable tar --xz test.
 
 Although xz is available, ancient tar didn't have the --xz option.
 ---
diff --git a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
index 7205bd4..a08dcad 100644
--- a/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
+++ b/0027-EPEL-5-Ignore-sparsify-error-if-qemu-img-help-is-kil.patch
@@ -1,7 +1,7 @@
 From 997e1c72b40609777e5ea166a6b8ac5837c355f4 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 31 Aug 2012 22:12:59 +0100
-Subject: [PATCH 27/35] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
+Subject: [PATCH 27/36] EPEL 5: Ignore sparsify error if qemu-img --help is killed by a signal.
 
 ---
  sparsify/sparsify.ml |    3 +--
diff --git a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch b/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
index 5121fbb..444b2be 100644
--- a/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
+++ b/0028-EPEL-5-Revert-daemon-remove-call-to-obsolete-udevset.patch
@@ -1,7 +1,7 @@
 From d4aec723e9f35871b068e106a464f3d36f2a6222 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Mon, 3 Sep 2012 11:04:39 +0100
-Subject: [PATCH 28/35] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
+Subject: [PATCH 28/36] EPEL 5: Revert "daemon: remove call to obsolete udevsettle"
 
 This reverts commit b6413f8dbef92c46c4baf9499366716a166f2163.
 ---
diff --git a/0029-EPEL-5-No-libtoolize-install-option.patch b/0029-EPEL-5-No-libtoolize-install-option.patch
index 60d5613..cca4dc3 100644
--- a/0029-EPEL-5-No-libtoolize-install-option.patch
+++ b/0029-EPEL-5-No-libtoolize-install-option.patch
@@ -1,7 +1,7 @@
 From 6c29724ee7bb159aed59d5dddb0a12d5b67933ec Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 19:09:21 +0000
-Subject: [PATCH 29/35] EPEL 5: No libtoolize --install option.
+Subject: [PATCH 29/36] EPEL 5: No libtoolize --install option.
 
 ---
  bootstrap |    2 +-
diff --git a/0030-EPEL-5-Disable-valgrind.patch b/0030-EPEL-5-Disable-valgrind.patch
index 66d3188..e175e20 100644
--- a/0030-EPEL-5-Disable-valgrind.patch
+++ b/0030-EPEL-5-Disable-valgrind.patch
@@ -1,7 +1,7 @@
 From 6edc5f2cda3c08345e8a31d2dc25a67d0c219b2e Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 19:19:43 +0000
-Subject: [PATCH 30/35] EPEL 5: Disable valgrind.
+Subject: [PATCH 30/36] EPEL 5: Disable valgrind.
 
 Ancient automake didn't have AM_SUBST_NOTMAKE.
 ---
diff --git a/0031-EPEL-5-Remove-Linux-capabilities.patch b/0031-EPEL-5-Remove-Linux-capabilities.patch
index 0973cf0..bccb2b6 100644
--- a/0031-EPEL-5-Remove-Linux-capabilities.patch
+++ b/0031-EPEL-5-Remove-Linux-capabilities.patch
@@ -1,7 +1,7 @@
 From c32692da782d5febcbda9b449550873697977f81 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Fri, 8 Mar 2013 20:20:23 +0000
-Subject: [PATCH 31/35] EPEL 5: Remove Linux capabilities.
+Subject: [PATCH 31/36] EPEL 5: Remove Linux capabilities.
 
 Linux file capabilities are not supported in RHEL 5, and the
 cap_*_file functions don't exist in the libcap library (although
diff --git a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
index f43b06c..89a6fef 100644
--- a/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
+++ b/0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
@@ -1,7 +1,7 @@
 From 3a79e5714a38873aed9ad1847f77c4e2710c458b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Sat, 9 Mar 2013 19:24:29 +0000
-Subject: [PATCH 32/35] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
+Subject: [PATCH 32/36] EPEL 5: ruby: Use old rake/rdoctask and rake/gempackagetask.
 
 The 'begin ... rescue' code is supposed to ensure these old packages
 are required, but for reasons not understood this doesn't work on
diff --git a/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch b/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
index 3bff354..0a54c43 100644
--- a/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
+++ b/0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
@@ -1,7 +1,7 @@
 From 4ef4ff4158c0a7672ee784b1ff2df1ac5380ed2b Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Wed, 29 May 2013 14:35:54 +0100
-Subject: [PATCH 33/35] generator: Set abs_builddir for old RHEL 5 which didn't have this.
+Subject: [PATCH 33/36] generator: Set abs_builddir for old RHEL 5 which didn't have this.
 
 ---
  generator/Makefile.am |    3 +++
diff --git a/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch b/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
index face9c0..fa7dff9 100644
--- a/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
+++ b/0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
@@ -1,7 +1,7 @@
 From 9fbceb6949778b8daace7610e35991fadac087b5 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Wed, 29 May 2013 16:15:24 +0100
-Subject: [PATCH 34/35] generator: Set abs_srcdir for old RHEL 5 which didn't have this.
+Subject: [PATCH 34/36] generator: Set abs_srcdir for old RHEL 5 which didn't have this.
 
 ---
  generator/Makefile.am |    3 +++
diff --git a/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch b/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
index 78b149a..1d7506c 100644
--- a/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
+++ b/0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
@@ -1,7 +1,7 @@
 From 4d9ace3f868e4cb32f79b597910c5904cb522ea6 Mon Sep 17 00:00:00 2001
 From: Richard W.M. Jones <rjones@redhat.com>
 Date: Wed, 29 May 2013 16:22:02 +0100
-Subject: [PATCH 35/35] generator: Set builddir for old RHEL 5 which didn't have this.
+Subject: [PATCH 35/36] generator: Set builddir for old RHEL 5 which didn't have this.
 
 ---
  generator/Makefile.am |    3 +++
diff --git a/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch b/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
new file mode 100644
index 0000000..dc9ec5b
--- /dev/null
+++ b/0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
@@ -0,0 +1,97 @@
+From aff69dc6e3b4161cd538fb3d100a7fed9f91c9ac Mon Sep 17 00:00:00 2001
+From: Richard W.M. Jones <rjones@redhat.com>
+Date: Wed, 29 May 2013 17:27:06 +0100
+Subject: [PATCH 36/36] EPEL 5: Revert "Use pkg-config for Python"
+
+In RHEL 5, python doesn't have pkg-config configuration.
+
+This reverts commit ba2e4f1794dabdb251823c86ee843a0fe3186a74.
+---
+ configure.ac       |   35 +++++++++++++++--------------------
+ python/Makefile.am |    2 +-
+ 2 files changed, 16 insertions(+), 21 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0fd6bf0..b077c44 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1020,6 +1020,7 @@ AM_CONDITIONAL([HAVE_PERL],
+ dnl Check for Python (optional, for Python bindings).
+ PYTHON_PREFIX=
+ PYTHON_VERSION=
++PYTHON_INCLUDEDIR=
+ PYTHON_INSTALLDIR=
+ 
+ AC_ARG_ENABLE([python],
+@@ -1030,30 +1031,23 @@ AS_IF([test "x$enable_python" != "xno"],[
+     AC_CHECK_PROG([PYTHON],[python],[python],[no])
+ 
+     if test "x$PYTHON" != "xno"; then
++        AC_MSG_CHECKING([Python prefix])
++        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
++        AC_MSG_RESULT([$PYTHON_PREFIX])
++
+ 	AC_MSG_CHECKING([Python version])
+         PYTHON_VERSION_MAJOR=`$PYTHON -c "import sys; print (sys.version_info@<:@0@:>@)"`
+         PYTHON_VERSION_MINOR=`$PYTHON -c "import sys; print (sys.version_info@<:@1@:>@)"`
+         PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR"
+ 	AC_MSG_RESULT([$PYTHON_VERSION])
+-        # Debian: python-2.7.pc, python-3.2.pc
+-        PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[
+-            AC_SUBST([PYTHON_CFLAGS])
+-            AC_SUBST([PYTHON_LIBS])
+-            AC_SUBST([PYTHON_VERSION])
+-            AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
+-        ],[
+-            PKG_CHECK_MODULES([PYTHON], [python],[
+-                AC_SUBST([PYTHON_CFLAGS])
+-                AC_SUBST([PYTHON_LIBS])
+-                AC_SUBST([PYTHON_VERSION])
+-                AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time])
+-            ],[
+-                AC_MSG_WARN([python $PYTHON_VERSION not found])
+-            ])
+-        ])
+-        AC_MSG_CHECKING([Python prefix])
+-        PYTHON_PREFIX=`$PYTHON -c "import sys; print (sys.prefix)"`
+-        AC_MSG_RESULT([$PYTHON_PREFIX])
++
++        AC_MSG_CHECKING([for Python include path])
++        if test -z "$PYTHON_INCLUDEDIR"; then
++            python_path=`$PYTHON -c "import distutils.sysconfig; \
++                                     print (distutils.sysconfig.get_python_inc ());"`
++            PYTHON_INCLUDEDIR=$python_path
++        fi
++        AC_MSG_RESULT([$PYTHON_INCLUDEDIR])
+ 
+         AC_ARG_WITH([python-installdir],
+                     [AS_HELP_STRING([--with-python-installdir],
+@@ -1091,10 +1085,11 @@ AS_IF([test "x$enable_python" != "xno"],[
+ 
+     AC_SUBST(PYTHON_PREFIX)
+     AC_SUBST(PYTHON_VERSION)
++    AC_SUBST(PYTHON_INCLUDEDIR)
+     AC_SUBST(PYTHON_INSTALLDIR)
+ ])
+ AM_CONDITIONAL([HAVE_PYTHON],
+-    [test "x$PYTHON" != "xno" && test "x$PYTHON_LIBS" != "x" ])
++    [test "x$PYTHON" != "xno" && test "x$PYTHON_INCLUDEDIR" != "x" && test "x$PYTHON_INSTALLDIR" != "x"])
+ 
+ dnl Check for Ruby and rake (optional, for Ruby bindings).
+ AC_ARG_ENABLE([ruby],
+diff --git a/python/Makefile.am b/python/Makefile.am
+index c88b994..3bc01b5 100644
+--- a/python/Makefile.am
++++ b/python/Makefile.am
+@@ -43,7 +43,7 @@ libguestfsmod_la_SOURCES = guestfs-py.c guestfs-py.h guestfs-py-byhand.c
+ 
+ libguestfsmod_la_CPPFLAGS = \
+ 	-DGUESTFS_PRIVATE=1 \
+-	$(PYTHON_CFLAGS) \
++	-I$(PYTHON_INCLUDEDIR) \
+ 	-I$(top_srcdir)/src -I$(top_builddir)/src
+ 
+ libguestfsmod_la_CFLAGS = \
+-- 
+1.7.4.1
+
diff --git a/libguestfs.spec b/libguestfs.spec
index 80a2382..1fd495d 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -22,7 +22,7 @@ Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
 Version:       1.20.7
-Release:       2%{?dist}
+Release:       3%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -79,6 +79,7 @@ Patch0032:     0032-EPEL-5-ruby-Use-old-rake-rdoctask-and-rake-gempackag.patch
 Patch0033:     0033-generator-Set-abs_builddir-for-old-RHEL-5-which-didn.patch
 Patch0034:     0034-generator-Set-abs_srcdir-for-old-RHEL-5-which-didn-t.patch
 Patch0035:     0035-generator-Set-builddir-for-old-RHEL-5-which-didn-t-h.patch
+Patch0036:     0036-EPEL-5-Revert-Use-pkg-config-for-Python.patch
 
 # Basic build requirements:
 BuildRequires: /usr/bin/pod2man
@@ -917,7 +918,7 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Wed May 29 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.7-2
+* Wed May 29 2013 Richard W.M. Jones <rjones@redhat.com> - 1:1.20.7-3
 - Rebase to upstream stable branch version 1.20.7.
 - Includes fix for inspection vulnerability (RHBZ#968315).