From aedaf2a125db8f7dd0e465b72fa01e1a33e785d1 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Sat, 17 Jan 2015 15:08:43 +0000
Subject: [PATCH] New upstream version 1.29.20.

---
 ...ow-test-lvm-mapping.pl-to-be-skipped.patch | 25 +++++++++++++++++++
 libguestfs.spec                               | 23 ++++++++++++++---
 sources                                       |  2 +-
 3 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch

diff --git a/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch b/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
new file mode 100644
index 0000000..b2c6e3e
--- /dev/null
+++ b/0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
@@ -0,0 +1,25 @@
+From 5ab3a75e1dba7cacd45ff9a094bf27c517edd117 Mon Sep 17 00:00:00 2001
+From: "Richard W.M. Jones" <rjones@redhat.com>
+Date: Sat, 17 Jan 2015 14:24:35 +0000
+Subject: [PATCH] tests/lvm: Allow test-lvm-mapping.pl to be skipped.
+
+---
+ tests/lvm/test-lvm-mapping.pl | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tests/lvm/test-lvm-mapping.pl b/tests/lvm/test-lvm-mapping.pl
+index 79a5bdd..2509231 100755
+--- a/tests/lvm/test-lvm-mapping.pl
++++ b/tests/lvm/test-lvm-mapping.pl
+@@ -22,6 +22,8 @@ use warnings;
+ 
+ use Sys::Guestfs;
+ 
++exit 77 if $ENV{SKIP_TEST_LVM_MAPPING_PL};
++
+ my $g = Sys::Guestfs->new ();
+ 
+ $g->add_drive_scratch (256 * 1024 * 1024);
+-- 
+2.1.0
+
diff --git a/libguestfs.spec b/libguestfs.spec
index df9b2c9..e1d659b 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -24,7 +24,7 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.29.19
+Version:       1.29.20
 Release:       1%{?dist}
 License:       LGPLv2+
 
@@ -32,6 +32,9 @@ License:       LGPLv2+
 URL:           http://libguestfs.org/
 Source0:       http://libguestfs.org/download/1.29-development/%{name}-%{version}.tar.gz
 
+# Upstream patch to allow LVM test to be skipped in check section.
+Patch1:        0001-tests-lvm-Allow-test-lvm-mapping.pl-to-be-skipped.patch
+
 # Basic build requirements:
 BuildRequires: perl(Pod::Simple)
 BuildRequires: perl(Pod::Man)
@@ -729,14 +732,14 @@ for %{name}.
 %prep
 %setup -q
 
+%patch1 -p1
+
 if [ "$(getenforce | tr '[A-Z]' '[a-z]')" != "disabled" ]; then
     # For sVirt to work, the local temporary directory we use in the
     # tests must be labelled the same way as /tmp.
     chcon --reference=/tmp tmp
 fi
 
-mkdir -p daemon/m4
-
 # Replace developer-centric README that ships with libguestfs, with
 # our replacement file.
 mv README README.orig
@@ -825,6 +828,12 @@ export SKIP_TEST_SET_LABEL=1
 export SKIP_TEST_VIRT_ALIGNMENT_SCAN_GUESTS_SH=1
 export SKIP_TEST_VIRT_DF_GUESTS_SH=1
 
+# Disable sfdisk test (RHBZ#1183234).
+export SKIP_TEST_PART_GET_MBR_ID_0=1
+
+# Disable a test which uses sfdisk (RHBZ#1183236).
+export SKIP_TEST_LVM_MAPPING_PL=1
+
 # Skip gnulib tests which fail (probably these are kernel/glibc bugs).
 pushd gnulib/tests
 make -k check ||:
@@ -1226,6 +1235,14 @@ popd
 
 
 %changelog
+* Sat Jan 17 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.20-1
+- New upstream version 1.29.20.
+
+- Rebuild upstream with automake 1.15.
+- Add upstream patch to allow LVM test to be skipped.
+- Skip a couple of tests which are broken by changes in Rawhide.
+- Remove bogus daemon/m4 directory which has not existed for years.
+
 * Tue Dec 23 2014 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.19-1
 - New upstream version 1.29.19.
 
diff --git a/sources b/sources
index 5459718..a3feb11 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3f902bf78074258292e360c5d1d72d95  libguestfs-1.29.19.tar.gz
+5e3f56fe4ee0de76d0575e2b58e3f933  libguestfs-1.29.20.tar.gz