- bnc#780660 - Yast does not offer "Virtualization" section by

default, and no "Install Hypervisor" option, after loading
  yast-vm. 
  virtman-kvm-packages.diff

- bnc#780859 - virt-manager doesn't show the console screen
  virtman-reverse-serialcon.patch

OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=107

virt-manager.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Thu Sep 20 15:03:48 MDT 2012 - carnold@novell.com
+
+- bnc#780660 - Yast does not offer "Virtualization" section by
+  default, and no "Install Hypervisor" option, after loading
+  yast-vm. 
+  virtman-kvm-packages.diff
+
+-------------------------------------------------------------------
+Tue Sep 18 14:08:46 MDT 2012 - carnold@novell.com
+
+- bnc#780859 - virt-manager doesn't show the console screen
+  virtman-reverse-serialcon.patch
+
 -------------------------------------------------------------------
 Thu Aug  9 15:19:27 MDT 2012 - carnold@novell.com
 

virt-manager.spec

@@ -15,7 +15,6 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
-
 %define gsysconfdir /etc
 %define gconftool /usr/bin/gconftool-2
 %define virtinst_maj 0
@@ -47,6 +46,8 @@ Patch64:        virtman-qed.diff
 Patch65:        virtman-update-backend.diff
 Patch66:        virtman-slow-mouse.diff
 Patch67:        virtman-virtinstall.diff
+Patch68:        virtman-reverse-serialcon.patch
+Patch69:        virtman-kvm-packages.diff
 ExclusiveArch:  %{ix86} x86_64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %gconf_schemas_prereq
@@ -71,13 +72,13 @@ Requires:       vtemodule.so
 %endif
 Requires:       librsvg
 Requires:       netcat-openbsd
+Requires:       scrollkeeper
+Requires:       python-gtk-vnc
+Requires:       python-urlgrabber
 Requires:       python-gconf
 Requires:       python-gobject2
 Requires:       python-gtk
-Requires:       python-gtk-vnc
-Requires:       python-urlgrabber
 Requires:       python-virtinst == %{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
-Requires:       scrollkeeper
 Requires:       xorg-x11-fonts
 Recommends:     python-SpiceClientGtk
 
@@ -112,6 +113,8 @@ Authors:
 %patch65 -p1
 %patch66 -p1
 %patch67 -p1
+%patch68 -p1
+%patch69 -p1
 
 %build
 # autoreconf -i

virtman-kvm-packages.diff

@@ -0,0 +1,31 @@
+bnc#780660
+Make process fails to substitute "" for ::HV_PACKAGES:: in virt-manager.py when
+being built from virt-manager.py.in.  Translate HV_ to KVM_ (just like all
+the other macros)
+
+Index: virt-manager-0.9.4/src/Makefile.am
+===================================================================
+--- virt-manager-0.9.4.orig/src/Makefile.am
++++ virt-manager-0.9.4/src/Makefile.am
+@@ -65,7 +65,7 @@ endif
+ 	  -e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
+ 	  -e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
+ 	  -e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
+-	  -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \
++	  -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \
+ 	  -e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \
+ 	  -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
+ 	  < $< > $@
+Index: virt-manager-0.9.4/src/Makefile.in
+===================================================================
+--- virt-manager-0.9.4.orig/src/Makefile.in
++++ virt-manager-0.9.4/src/Makefile.in
+@@ -814,7 +814,7 @@ uninstall-am: uninstall-binSCRIPTS unins
+ 	  -e "s,::DEFAULT_QEMU_USER::,$(DEFAULT_QEMU_USER)," \
+ 	  -e "s,::ENABLE_UNSUPPORTED_RHEL_OPTS::,$(ENABLE_UNSUPPORTED_RHEL_OPTS)," \
+ 	  -e "s|::PREFERRED_DISTROS::|$(PREFERRED_DISTROS)|" \
+-	  -e "s|::HV_PACKAGES::|$(KVM_PACKAGES)|" \
++	  -e "s|::KVM_PACKAGES::|$(KVM_PACKAGES)|" \
+ 	  -e "s|::ASKPASS_PACKAGE::|$(ASKPASS_PACKAGE)|" \
+ 	  -e "s|::LIBVIRT_PACKAGES::|$(LIBVIRT_PACKAGES)|" \
+ 	  < $< > $@

virtman-reverse-serialcon.patch

@@ -0,0 +1,20 @@
+Reverses upstream patch: serialcon: Don't open a console with name=None
+Git: ce94126b707f157d88de113a8c591e628d55db63
+bnc#780859
+
+Index: virt-manager-0.9.4/src/virtManager/serialcon.py
+===================================================================
+--- virt-manager-0.9.4.orig/src/virtManager/serialcon.py
++++ virt-manager-0.9.4/src/virtManager/serialcon.py
+@@ -191,8 +191,9 @@ class LibvirtConsoleConnection(ConsoleCo
+         name = dev and dev.alias.name or None
+         logging.debug("Opening console stream for dev=%s alias=%s",
+                       dev, name)
+-        if not name:
+-            raise RuntimeError(_("Cannot open a device with no alias name"))
++        # bnc#780859
++        #if not name:
++        #    raise RuntimeError(_("Cannot open a device with no alias name"))
+ 
+         self.stream = self.conn.vmm.newStream(libvirt.VIR_STREAM_NONBLOCK)
+