[qemu: 30/30] Merge branch 'f17'

[bonzini]

commit c7f7fc0b564506ced44e0aa5cd0e5b233037d298
Merge: 07beaa0 78e14de
Author: Paolo Bonzini <pbonzini at redhat.com>
Date:   Fri Apr 6 14:18:49 2012 +0200

    Merge branch 'f17'
    
    Conflicts:
    	qemu.spec

 qemu.binfmt |   23 +++++++++++++++++------
 qemu.spec   |   43 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 56 insertions(+), 10 deletions(-)
---
diff --cc qemu.spec
index 92accae,3bb1012..f76c8be
--- a/qemu.spec
+++ b/qemu.spec
@@@ -38,7 -1,7 +38,7 @@@
  Summary: QEMU is a FAST! processor emulator
  Name: qemu
  Version: 1.0
- Release: 13%{?dist}
 -Release: 12%{?dist}
++Release: 14%{?dist}
  # Epoch because we pushed a qemu-1.0 package
  Epoch: 2
  License: GPLv2+ and LGPLv2+ and BSD
@@@ -658,9 -607,12 +660,12 @@@ ln -s ../sgabios/sgabios.bin %{buildroo
  mkdir -p $RPM_BUILD_ROOT%{_exec_prefix}/lib/binfmt.d
  for i in dummy \
  %ifnarch %{ix86} x86_64
-     qemu-i386 \
+     qemu-i386 qemu-i486 \
  %endif
 -%if !%{with_x86only}
 +%if %{without x86only}
+ %ifnarch alpha
+     qemu-alpha \
+ %endif
  %ifnarch arm
      qemu-arm \
  %endif
@@@ -881,15 -859,13 +912,19 @@@ f
  %{_mandir}/man1/qemu-img.1*
  
  %changelog
- * Mon Apr  2 2012 Hans de Goede <hdegoede at redhat.com> - 2:1.0-13
+ * Fri Apr 6 2012 Paolo Bonzini <pbonzini at redhat.com> - 2:1.0-12
+ - Add back PPC and SPARC user emulators
+ - Update binfmt rules from upstream
+ 
+ * Mon Apr  2 2012 Hans de Goede <hdegoede at redhat.com> - 2:1.0-11
  - Some more USB bugfixes from upstream
  
 +* Thu Mar 29 2012 Eduardo Habkost <ehabkost at redhat.com> - 2:1.0-12
 +- Fix ExclusiveArch mistake that disabled all non-x86_64 builds on Fedora
 +
 +* Wed Mar 28 2012 Eduardo Habkost <ehabkost at redhat.com> - 2:1.0-11
 +- Use --with variables for build-time settings
 +
  * Wed Mar 28 2012 Daniel P. Berrange <berrange at redhat.com> - 2:1.0-10
  - Switch to use iPXE for netboot ROMs