[libguestfs] Fixes for i686.

[Richard W.M. Jones]

commit 6313bf3dba101275af539ab11ca8bdfdf226e1b4
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Fri Nov 23 21:02:12 2012 +0000

    Fixes for i686.
    
    - Remove non-upstream patch designed to work around
      https://bugzilla.redhat.com/show_bug.cgi?id=857026
      to see if this has been fixed.
    - Re-enable tests on i686 to see if
      https://bugzilla.redhat.com/show_bug.cgi?id=870042
      has been fixed.

 ...apic-flag-to-work-around-a-qemu-or-kernel.patch |   40 --------------------
 libguestfs.spec                                    |   17 ++++----
 2 files changed, 9 insertions(+), 48 deletions(-)
---
diff --git a/libguestfs.spec b/libguestfs.spec
index 57dda08..16c6aa9 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.19.63
-Release:       1%{?dist}
+Release:       2%{?dist}
 License:       LGPLv2+
 Group:         Development/Libraries
 URL:           http://libguestfs.org/
@@ -39,10 +39,6 @@ BuildRequires: autoconf, automake, libtool, gettext-devel
 # patch.
 Patch2:        libguestfs-1.19.2-remove-udev-from-packagelist.patch
 
-# Non-upstream patch to add the noapic flag on the kernel command line
-# on i386 only.  This works around a bug in 32-bit qemu (RHBZ#857026).
-Patch3:        0001-i386-Add-noapic-flag-to-work-around-a-qemu-or-kernel.patch
-
 %if 0%{?rhel} >= 7
 ExclusiveArch: x86_64
 %endif
@@ -710,7 +706,6 @@ fi
 autoreconf -i
 %endif
 %patch2 -p1
-%patch3 -p1
 
 mkdir -p daemon/m4
 
@@ -789,10 +784,8 @@ export SKIP_TEST_CHARSET_FIDELITY=1
 export SKIP_TEST_VIRT_FORMAT_SH=1
 
 %if %{runtests}
-%ifnarch %{ix86} # RHBZ#870042
 make check
 %endif
-%endif
 
 
 %install
@@ -1050,6 +1043,14 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/run/libguestfs
 
 
 %changelog
+* Fri Nov 23 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.63-2
+- Remove non-upstream patch designed to work around
+  https://bugzilla.redhat.com/show_bug.cgi?id=857026
+  to see if this has been fixed.
+- Re-enable tests on i686 to see if
+  https://bugzilla.redhat.com/show_bug.cgi?id=870042
+  has been fixed.
+
 * Fri Nov 23 2012 Richard W.M. Jones <rjones at redhat.com> - 1:1.19.63-1
 - New upstream version 1.19.63.