[virt-manager/f16: 21/21] Merge branch 'f17' into f16

[Cole Robinson]

commit d05e2173610bef15112c9a45aa7f26b23d1ba1f2
Merge: 48094af e6f2dd0
Author: Cole Robinson <crobinso at redhat.com>
Date:   Mon Jul 9 17:42:44 2012 -0400

    Merge branch 'f17' into f16
    
    Conflicts:
    	.gitignore
    	sources
    	virt-manager.spec

 .gitignore        |    1 +
 sources           |    2 +-
 virt-manager.spec |   81 +++++++++++++++++++++++++---------------------------
 3 files changed, 41 insertions(+), 43 deletions(-)
---
diff --cc virt-manager.spec
index da3fd93,c33f477..edc1bd6
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@@ -9,14 -9,21 +9,23 @@@
  %define preferred_distros          "fedora,rhel"
  %define kvm_packages               "qemu-system-x86"
  %define libvirt_packages           "libvirt"
+ %define askpass_package            "openssh-askpass"
  %define disable_unsupported_rhel   0
- %define default_graphics           "spice"
+ 
+ %define with_guestfs               0
+ %define with_tui                   1
  
 +%define with_guestfs               0
  %define with_spice                 1
 +%define with_tui                   1
  
  # End local config
+ # Default option handling
+ 
+ %if %{with_spice}
+ %define default_graphics "spice"
+ %endif
+ 
  
  # This macro is used for the continuous automated builds. It just
  # allows an extra fragment based on the timestamp to be appended
@@@ -280,8 -261,28 +263,22 @@@ update-desktop-database -q %{_datadir}/
  %endif
  
  %changelog
+ * Mon Jul 09 2012 Cole Robinson <crobinso at redhat.com> - 0.9.3-1
+ - Rebased to version 0.9.3
+ - Convert to gtkbuilder: UI can now be editted with modern glade tool
+ - virt-manager no longer runs on RHEL5, but can manage a remote RHEL5
+   host
+ - Option to configure spapr net and disk devices for pseries (Li Zhang)
+ - Offer to install openssh-askpass if we need it (bz 754484)
+ - Don't leave defunct SSH processes around (bz 757892)
+ - Offer to start libvirtd after install (bz 791152)
+ - Fix crash when deleting storage volumes (bz 805950)
+ - Show serial device PTY path again (bz 811760)
+ - Fix possible crash when rebooting fails (bz 813119)
+ - Offer to discard state if restore fails (bz 837236)
+ 
 -* Wed Jun 06 2012 Cole Robinson <crobinso at redhat.com> - 0.9.1-4
 +* Wed Jun 06 2012 Cole Robinson <crobinso at redhat.com> - 0.9.1-3
  - Fix connecting to console with specific listen address
 -- Fix regression that dropped spice dependency (bz 819270)
 -
 -* Wed Apr 25 2012 Cole Robinson <crobinso at redhat.com> - 0.9.1-3
 -- Actually make spice the default (bz 757874)
 -- Only depend on spice on arch it is available (bz 811030)
 -- Depend on libgnome-keyring (bz 811921)
  
  * Mon Feb 13 2012 Cole Robinson <crobinso at redhat.com> - 0.9.1-2
  - Fix error reporting for failed remote connections (bz 787011)