From f2ed3ceaa6917d9e093b0984a4e9dff27a3561b0 Mon Sep 17 00:00:00 2001
From: Richard W.M. Jones <rjones@fedoraproject.org>
Date: May 21 2009 19:01:03 +0000
Subject: Backport version 1.0.30 from devel branch.


---

diff --git a/.cvsignore b/.cvsignore
index fad1cb6..10c86aa 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libguestfs-1.0.27.tar.gz
+libguestfs-1.0.30.tar.gz
diff --git a/libguestfs.spec b/libguestfs.spec
index b05a3ff..3198b06 100644
--- a/libguestfs.spec
+++ b/libguestfs.spec
@@ -3,8 +3,8 @@
 
 Summary:     Access and modify virtual machine disk images
 Name:        libguestfs
-Version:     1.0.27
-Release:     1%{?dist}.2
+Version:     1.0.30
+Release:     1%{?dist}
 License:     LGPLv2+
 Group:       Development/Libraries
 URL:         http://et.redhat.com/~rjones/libguestfs/
@@ -268,15 +268,25 @@ make INSTALLDIRS=vendor %{?_smp_mflags}
 
 
 %check
+# Enable debugging - very useful if a test does fail, although
+# it produces masses of output in the build.log.
+export LIBGUESTFS_DEBUG=1
+
 # Uncomment one of these, depending on whether you want to
 # do a very long and thorough test ('make check') or just
 # a quick test to see if things generally work.
 
 # Currently tests are disabled on all architectures because of:
 #   BZ 494075 (ppc, ppc64)
-#   BZ 500564 (i386, x86-64)
+#   BZ 502058 (i386, x86-64) - only on F-11 we think, seems to work on F-12
 
-#make check
+# Workaround for BZ 502058.  This is only needed for F-11, but
+# won't harm other builds.
+export LIBGUESTFS_APPEND=noapic
+
+%ifarch %{ix86} x86_64
+make check
+%endif
 
 # Quick test:
 #./fish/guestfish -v <<EOT
@@ -452,6 +462,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.30-1
+- Backport version 1.0.30 from devel branch.
+
 * Thu May 21 2009 Richard Jones <rjones@redhat.com> - 1.0.27-1.fc11.2
 - Change requirement from qemu -> qemu-kvm (RHBZ#501761).
 
diff --git a/sources b/sources
index 14f1b1e..444ca68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-12c01468e2bdd9710d5c12eaad3bff89  libguestfs-1.0.27.tar.gz
+02147252fcfbc4701e275689c0dc75de  libguestfs-1.0.30.tar.gz