[qemu] Revert "Cherry pick patch from upstream which fixes build system, "

[Richard W.M. Jones]

commit 5c9ec95e323a6f8cf82d7231b1d81664a3c26ef0
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Thu Jul 5 14:12:43 2012 +0100

    Revert "Cherry pick patch from upstream which fixes build system,"
    
    This reverts commit 79efbf73dff145d4cdb773996bd7fee10bcee228.
    
    Sorry, this broke the build.

 ...move-user-objects-to-nested-Makefile.objs.patch |  137 --------------------
 qemu-kvm-1.1.0-siginfo_t.patch                     |   11 ++
 qemu.spec                                          |   12 +-
 3 files changed, 17 insertions(+), 143 deletions(-)
---
diff --git a/qemu-kvm-1.1.0-siginfo_t.patch b/qemu-kvm-1.1.0-siginfo_t.patch
new file mode 100644
index 0000000..9c27946
--- /dev/null
+++ b/qemu-kvm-1.1.0-siginfo_t.patch
@@ -0,0 +1,11 @@
+--- qemu-kvm-1.1.0/linux-user/signal.c	2012-06-30 03:14:15.000000000 +0100
++++ qemu-kvm-1.1.0.glibc/linux-user/signal.c	2012-07-05 11:08:36.839294266 +0100
+@@ -3476,7 +3476,7 @@
+ struct rt_signal_frame {
+         struct siginfo *pinfo;
+         void *puc;
+-        struct siginfo info;
++        siginfo_t info;
+         struct ucontext uc;
+         uint8_t retcode[8];       /* Trampoline code. */
+ };
diff --git a/qemu.spec b/qemu.spec
index e8265ee..c77a9a8 100644
--- a/qemu.spec
+++ b/qemu.spec
@@ -38,7 +38,7 @@
 Summary: QEMU is a FAST! processor emulator
 Name: qemu
 Version: 1.1.0
-Release: 3%{?dist}
+Release: 2%{?dist}
 # Epoch because we pushed a qemu-1.0 package
 Epoch: 2
 License: GPLv2+ and LGPLv2+ and BSD
@@ -82,9 +82,9 @@ Patch2:   0002-qemu-kvm-virtio-Do-not-register-mask-notifiers-witho.patch
 # Speculative patch to fix msi and virtio-pci modules in build (not upstream).
 Patch3:   0001-buildsys-Move-msi-x-and-virtio-pci-from-Makefile.obj.patch
 
-# Fix for build system (upstream, but not in stable-1.1).
-%global _default_patch_fuzz 2
-Patch4:   0001-build-move-user-objects-to-nested-Makefile.objs.patch
+# Hack to use siginfo_t instead of siginfo with glibc from Rawhide.
+# XXX This patch is highly UNlikely to be correct. (RWMJ)
+Patch4:   qemu-kvm-1.1.0-siginfo_t.patch
 
 # The infamous chardev flow control patches
 Patch101: 0101-char-Split-out-tcp-socket-close-code-in-a-separate-f.patch
@@ -803,14 +803,14 @@ fi
 %{_mandir}/man1/qemu-img.1*
 
 %changelog
-* Thu Jul  5 2012 Richard W.M. Jones <rjones at redhat.com> - 2:1.1.0-3
+* Thu Jul  5 2012 Richard W.M. Jones <rjones at redhat.com> - 2:1.1.0-2
+- Add a hack for glibc from Rawhide, only affects linux-user.
 - Disable tests since they hang intermittently.
 - Add kvmvapic.bin (replaces vapic.bin).
 - Add cpus-x86_64.conf.  qemu now creates /etc/qemu/target-x86_64.conf
   as an empty file.
 - Add qemu-icon.bmp.
 - Add qemu-bridge-helper.
-- Cherry pick patch from upstream which fixes build system.
 
 * Wed Jul  4 2012 Hans de Goede <hdegoede at redhat.com> - 2:1.1.0-1
 - New upstream release 1.1.0