From c6db2d645c5a22660f5514c82b8fe8bdc7260a19 Mon Sep 17 00:00:00 2001
From: "Richard W.M. Jones" <rjones@redhat.com>
Date: Thu, 22 Jan 2015 21:25:23 +0000
Subject: [PATCH] New upstream version 1.29.22.

---
 libguestfs.spec | 13 +++++++++++--
 sources         |  2 +-
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/libguestfs.spec b/libguestfs.spec
index 407e441..1716dc9 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -24,8 +24,8 @@
 Summary:       Access and modify virtual machine disk images
 Name:          libguestfs
 Epoch:         1
-Version:       1.29.20
-Release:       2%{?dist}
+Version:       1.29.22
+Release:       1%{?dist}
 License:       LGPLv2+
 
 # Source and patches.
@@ -71,6 +71,7 @@ BuildRequires: unzip
 BuildRequires: ocaml
 BuildRequires: ocaml-findlib-devel
 BuildRequires: ocaml-gettext-devel
+BuildRequires: ocaml-ounit-devel
 BuildRequires: systemd-units
 BuildRequires: netpbm-progs
 BuildRequires: icoutils
@@ -835,6 +836,9 @@ export SKIP_TEST_VIRT_DF_GUESTS_SH=1
 # Disable sfdisk test (RHBZ#1183234).
 export SKIP_TEST_PART_GET_MBR_ID_0=1
 
+# Disable fuse test (RHBZ#1184762).
+export SKIP_TEST_FUSE_SH=1
+
 # Skip gnulib tests which fail (probably these are kernel/glibc bugs).
 pushd gnulib/tests
 make -k check ||:
@@ -1236,6 +1240,11 @@ popd
 
 
 %changelog
+* Thu Jan 22 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.22-1
+- New upstream version 1.29.22.
+- BR ounit (will be required for building >= 1.29.23).
+- Disable FUSE tests because of a bug in Rawhide.
+
 * Mon Jan 19 2015 Richard W.M. Jones <rjones@redhat.com> - 1:1.29.20-2
 - Bump release for f22-ruby.
 
diff --git a/sources b/sources
index a3feb11..33e5a2e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5e3f56fe4ee0de76d0575e2b58e3f933  libguestfs-1.29.20.tar.gz
+4091733e68d156e17ec9114aece64bf7  libguestfs-1.29.22.tar.gz