From 957b08b0c43047a46411f0c1c4eafb0d10f8270e Mon Sep 17 00:00:00 2001
From: OBS User autobuild <null@suse.de>
Date: Fri, 2 Apr 2010 22:21:36 +0000
Subject: [PATCH] Accepting request 36841 from Virtualization

checked in (request 36841)

OBS-URL: https://build.opensuse.org/request/show/36841
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=24
---
 virt-manager-0.8.3.tar.bz2  |  3 +++
 virt-manager-0.8.4.tar.bz2  |  3 ---
 virt-manager.changes        | 29 -----------------------------
 virt-manager.spec           | 17 +++++------------
 virtinst-0.500.2.tar.bz2    |  3 +++
 virtinst-0.500.3.tar.bz2    |  3 ---
 virtinst-cdrom.diff         |  8 ++++----
 virtinst-storage-ocfs2.diff |  8 +++-----
 virtman-autoconnect.diff    |  8 ++++----
 virtman-cdrom.diff          |  8 ++++----
 virtman-desktop.diff        | 18 +++++++++---------
 virtman-device-flags.diff   | 30 +++++++++++++++---------------
 virtman-help.diff           |  6 +++---
 virtman-icon.diff           | 12 ------------
 virtman-keycombo.diff       | 22 +++++++++++-----------
 virtman-kvm.diff            |  8 ++++----
 virtman-netcat.diff         | 30 ++++++++++++------------------
 virtman-vminstall.diff      | 10 +++++-----
 18 files changed, 85 insertions(+), 141 deletions(-)
 create mode 100644 virt-manager-0.8.3.tar.bz2
 delete mode 100644 virt-manager-0.8.4.tar.bz2
 create mode 100644 virtinst-0.500.2.tar.bz2
 delete mode 100644 virtinst-0.500.3.tar.bz2
 delete mode 100644 virtman-icon.diff

diff --git a/virt-manager-0.8.3.tar.bz2 b/virt-manager-0.8.3.tar.bz2
new file mode 100644
index 0000000..c2c00d2
--- /dev/null
+++ b/virt-manager-0.8.3.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e7b55303a65a4e0bbbfa8c4e63b06e4b66a23afa490faa5fccc1251428ea6b1f
+size 1521896
diff --git a/virt-manager-0.8.4.tar.bz2 b/virt-manager-0.8.4.tar.bz2
deleted file mode 100644
index 3d091c6..0000000
--- a/virt-manager-0.8.4.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:4ae4049690ab02c7b960a4f174dc6cf9a0e07f403a4f04ea5bc98f5f48b1242a
-size 1574898
diff --git a/virt-manager.changes b/virt-manager.changes
index 6332148..68184af 100644
--- a/virt-manager.changes
+++ b/virt-manager.changes
@@ -1,32 +1,3 @@
--------------------------------------------------------------------
-Wed Mar 31 16:18:34 MDT 2010 - carnold@novell.com
-
-- bnc#592538 - VM status is recognized as "Shutoff" in virt-manager
-  and virt-viewer after creating a snapshot.
-
--------------------------------------------------------------------
-Fri Mar 26 10:49:58 MDT 2010 - carnold@novell.com
-
-- Update to virt-manager 0.8.4
-  * Import install option: create a VM using an existing OS image
-  * Support multiple boot devices and boot order
-  * Watchdog device support
-  * Enable setting a human readable VM description.
-  * Option to manually specifying a bridge name, if bridge isn't
-    detected
-- Update to virtinst 0.500.3
-  * virt-install: New --watchdog option: configure a virtual
-    watchdog dev
-  * virt-install: New --soundhw option: More flexible sound
-    configuration deprecates --sound, though back compat is
-    maintained
-  * virt-install: New --security option: configure VM security
-    driver
-  * virt-install: New --description option: set a human readable
-    desc
-  * Better OS defaults: Use <video> VGA and <sound> AC97 if
-    support
-
 -------------------------------------------------------------------
 Tue Mar 23 15:10:52 MDT 2010 - carnold@novell.com
 
diff --git a/virt-manager.spec b/virt-manager.spec
index 1507a18..fccfc9b 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package virt-manager (Version 0.8.4)
+# spec file for package virt-manager (Version 0.8.3)
 #
 # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -22,13 +22,13 @@
 %define gconftool /usr/bin/gconftool-2
 %define virtinst_maj 0
 %define virtinst_min 500
-%define virtinst_rel 3
+%define virtinst_rel 2
 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel}
 
 Name:           virt-manager
 Summary:        Virtual Machine Manager
-Version:        0.8.4
-Release:        2
+Version:        0.8.3
+Release:        3
 Group:          System/Monitoring
 License:        LGPLv2.1+
 Url:            http://virt-manager.et.redhat.com
@@ -46,12 +46,11 @@ Patch58:        virtman-help.diff
 Patch59:        virtman-keycombo.diff
 Patch60:        virtman-autoconnect.diff
 Patch61:        virtman-device-flags.diff
-Patch62:        virtman-icon.diff
 Patch81:        virtinst-cdrom.diff
 Patch82:        virtinst-storage-ocfs2.diff
 ExclusiveArch:  %{ix86} x86_64
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%gconf_schemas_prereq
+#%gconf_schemas_prereq
 #
 #rpmlint BuildRequires:  python
 BuildRequires:  gtk2-devel
@@ -137,7 +136,6 @@ Authors:
 %patch59 -p1
 %patch60 -p1
 %patch61 -p1
-%patch62 -p1
 pushd $RPM_BUILD_DIR/%{virtinst_name}
 %patch81 -p1
 %patch82 -p1
@@ -157,7 +155,6 @@ popd
 make install  DESTDIR=$RPM_BUILD_ROOT
 pushd $RPM_BUILD_DIR/%{virtinst_name}
 python setup.py install --prefix=%{_prefix} --root=$RPM_BUILD_ROOT --install-lib=%{_datadir}/virt-manager
-rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 popd
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a
 #rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la
@@ -207,12 +204,8 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization;
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/*.glade
 %dir %{_datadir}/%{name}/pixmaps
-%dir %{_datadir}/%{name}/pixmaps/hicolor/
-%dir %{_datadir}/%{name}/pixmaps/hicolor/*/
-%dir %{_datadir}/%{name}/pixmaps/hicolor/*/*/
 %{_datadir}/%{name}/pixmaps/*.png
 %{_datadir}/%{name}/pixmaps/*.svg
-%{_datadir}/%{name}/pixmaps/hicolor/*/*/*.png
 %{_datadir}/%{name}/*.py
 %dir %{_datadir}/%{name}/virtManager
 %{_datadir}/%{name}/virtManager/*.py
diff --git a/virtinst-0.500.2.tar.bz2 b/virtinst-0.500.2.tar.bz2
new file mode 100644
index 0000000..3e38686
--- /dev/null
+++ b/virtinst-0.500.2.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:671204f7276af791d92f4442c24898aa234cfa64864c4923e9a6269efea86b26
+size 309222
diff --git a/virtinst-0.500.3.tar.bz2 b/virtinst-0.500.3.tar.bz2
deleted file mode 100644
index 1c45b57..0000000
--- a/virtinst-0.500.3.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:240dc47ad78ffc0134abd7c01ac860be6435faa086f8d4415dbf5f325926324d
-size 336222
diff --git a/virtinst-cdrom.diff b/virtinst-cdrom.diff
index 10495d8..57a3f28 100644
--- a/virtinst-cdrom.diff
+++ b/virtinst-cdrom.diff
@@ -1,8 +1,8 @@
-Index: virtinst-0.500.3/virtinst/VirtualDisk.py
+Index: virtinst-0.500.2/virtinst/VirtualDisk.py
 ===================================================================
---- virtinst-0.500.3.orig/virtinst/VirtualDisk.py
-+++ virtinst-0.500.3/virtinst/VirtualDisk.py
-@@ -1441,14 +1441,18 @@ class VirtualDisk(VirtualDevice):
+--- virtinst-0.500.2.orig/virtinst/VirtualDisk.py
++++ virtinst-0.500.2/virtinst/VirtualDisk.py
+@@ -1370,14 +1370,18 @@ class VirtualDisk(VirtualDevice):
                  self.target = "hdc"
                  return self.target
  
diff --git a/virtinst-storage-ocfs2.diff b/virtinst-storage-ocfs2.diff
index d4b70c1..9c8b6c8 100644
--- a/virtinst-storage-ocfs2.diff
+++ b/virtinst-storage-ocfs2.diff
@@ -1,8 +1,6 @@
-Index: virtinst-0.500.3/virtinst/Storage.py
-===================================================================
---- virtinst-0.500.3.orig/virtinst/Storage.py
-+++ virtinst-0.500.3/virtinst/Storage.py
-@@ -522,7 +522,7 @@ class FilesystemPool(StoragePool):
+--- virtinst-0.500.2.orig/virtinst/Storage.py	Tue Feb 23 13:54:26 2010 +0800
++++ virtinst-0.500.2/virtinst/Storage.py	Tue Feb 23 13:58:59 2010 +0800
+@@ -519,7 +519,7 @@
      get_volume_class = staticmethod(get_volume_class)
  
      formats = [ "auto", "ext2", "ext3", "ext4", "ufs", "iso9660", "udf",
diff --git a/virtman-autoconnect.diff b/virtman-autoconnect.diff
index 4c69a49..bca513e 100644
--- a/virtman-autoconnect.diff
+++ b/virtman-autoconnect.diff
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.4/src/virtManager/engine.py
+Index: virt-manager-0.8.3/src/virtManager/engine.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.4/src/virtManager/engine.py
-@@ -689,7 +689,7 @@ class vmmEngine(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/engine.py
++++ virt-manager-0.8.3/src/virtManager/engine.py
+@@ -474,7 +474,7 @@ class vmmEngine(gobject.GObject):
          self.emit("connection-added", conn)
          self.config.add_connection(conn.get_uri())
          if autoconnect:
diff --git a/virtman-cdrom.diff b/virtman-cdrom.diff
index 4535e94..4bb5bea 100644
--- a/virtman-cdrom.diff
+++ b/virtman-cdrom.diff
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.4/src/virtManager/addhardware.py
+Index: virt-manager-0.8.3/src/virtManager/addhardware.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
-+++ virt-manager-0.8.4/src/virtManager/addhardware.py
-@@ -464,6 +464,7 @@ class vmmAddHardware(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
++++ virt-manager-0.8.3/src/virtManager/addhardware.py
+@@ -465,6 +465,7 @@ class vmmAddHardware(gobject.GObject):
          if self.vm.get_hv_type() == "kvm":
              add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk")
          if self.vm.get_connection().is_xen():
diff --git a/virtman-desktop.diff b/virtman-desktop.diff
index 2440567..cebe63e 100644
--- a/virtman-desktop.diff
+++ b/virtman-desktop.diff
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.4/src/Makefile.am
+Index: virt-manager-0.8.3/src/Makefile.am
 ===================================================================
---- virt-manager-0.8.4.orig/src/Makefile.am
-+++ virt-manager-0.8.4/src/Makefile.am
+--- virt-manager-0.8.3.orig/src/Makefile.am
++++ virt-manager-0.8.3/src/Makefile.am
 @@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
  glade_DATA = $(wildcard $(srcdir)/*.glade)
@@ -11,10 +11,10 @@ Index: virt-manager-0.8.4/src/Makefile.am
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  
-Index: virt-manager-0.8.4/src/Makefile.in
+Index: virt-manager-0.8.3/src/Makefile.in
 ===================================================================
---- virt-manager-0.8.4.orig/src/Makefile.in
-+++ virt-manager-0.8.4/src/Makefile.in
+--- virt-manager-0.8.3.orig/src/Makefile.in
++++ virt-manager-0.8.3/src/Makefile.in
 @@ -240,7 +240,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in
  libexec_SCRIPTS = $(PACKAGE)-launch
  gladedir = $(pkgdatadir)
@@ -24,10 +24,10 @@ Index: virt-manager-0.8.4/src/Makefile.in
  desktop_DATA_IN = $(PACKAGE).desktop.in.in
  desktop_DATA = $(PACKAGE).desktop
  dbusdir = $(datadir)/dbus-1/services
-Index: virt-manager-0.8.4/src/virt-manager.desktop.in.in
+Index: virt-manager-0.8.3/src/virt-manager.desktop.in.in
 ===================================================================
---- virt-manager-0.8.4.orig/src/virt-manager.desktop.in.in
-+++ virt-manager-0.8.4/src/virt-manager.desktop.in.in
+--- virt-manager-0.8.3.orig/src/virt-manager.desktop.in.in
++++ virt-manager-0.8.3/src/virt-manager.desktop.in.in
 @@ -1,9 +1,20 @@
  [Desktop Entry]
  _Name=Virtual Machine Manager
diff --git a/virtman-device-flags.diff b/virtman-device-flags.diff
index bd5507b..d67214b 100644
--- a/virtman-device-flags.diff
+++ b/virtman-device-flags.diff
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.4/src/virtManager/addhardware.py
+Index: virt-manager-0.8.3/src/virtManager/addhardware.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/addhardware.py
-+++ virt-manager-0.8.4/src/virtManager/addhardware.py
-@@ -1010,6 +1010,18 @@ class vmmAddHardware(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/addhardware.py
++++ virt-manager-0.8.3/src/virtManager/addhardware.py
+@@ -1047,6 +1047,18 @@ class vmmAddHardware(gobject.GObject):
          self._dev.get_xml_config()
          logging.debug("Adding device:\n" + self._dev.get_xml_config())
  
@@ -21,11 +21,11 @@ Index: virt-manager-0.8.4/src/virtManager/addhardware.py
          # Hotplug device
          attach_err = False
          try:
-Index: virt-manager-0.8.4/src/virtManager/details.py
+Index: virt-manager-0.8.3/src/virtManager/details.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/details.py
-+++ virt-manager-0.8.4/src/virtManager/details.py
-@@ -1413,6 +1413,17 @@ class vmmDetails(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/details.py
++++ virt-manager-0.8.3/src/virtManager/details.py
+@@ -1194,6 +1194,17 @@ class vmmDetails(gobject.GObject):
                  return
              self.config.set_confirm_removedev(not skip_prompt)
  
@@ -43,13 +43,13 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
          # Define the change
          try:
              self.vm.remove_device(dev_type, dev_id_info)
-Index: virt-manager-0.8.4/src/virtManager/domain.py
+Index: virt-manager-0.8.3/src/virtManager/domain.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/domain.py
-+++ virt-manager-0.8.4/src/virtManager/domain.py
-@@ -1370,6 +1370,10 @@ class vmmDomain(vmmDomainBase):
- 
-         self._backend.attachDevice(devxml)
+--- virt-manager-0.8.3.orig/src/virtManager/domain.py
++++ virt-manager-0.8.3/src/virtManager/domain.py
+@@ -1286,6 +1286,10 @@ class vmmDomain(vmmDomainBase):
+             xml = devobj.get_xml_config()
+             self._backend.attachDevice(xml)
  
 +    def attach_device_flags(self, devobj, flags):
 +        xml = devobj.get_xml_config()
@@ -58,7 +58,7 @@ Index: virt-manager-0.8.4/src/virtManager/domain.py
      def detach_device(self, devtype, dev_id_info):
          """
          Hotunplug device from running guest
-@@ -1378,6 +1382,10 @@ class vmmDomain(vmmDomainBase):
+@@ -1294,6 +1298,10 @@ class vmmDomain(vmmDomainBase):
          if self.is_active():
              self._backend.detachDevice(xml)
  
diff --git a/virtman-help.diff b/virtman-help.diff
index 1a6fc30..5812604 100644
--- a/virtman-help.diff
+++ b/virtman-help.diff
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
+Index: virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
 ===================================================================
---- virt-manager-0.8.4.orig/help/virt-manager/C/virt-manager.xml
-+++ virt-manager-0.8.4/help/virt-manager/C/virt-manager.xml
+--- virt-manager-0.8.3.orig/help/virt-manager/C/virt-manager.xml
++++ virt-manager-0.8.3/help/virt-manager/C/virt-manager.xml
 @@ -821,218 +821,9 @@
    <title>The Create Wizard</title>
    <para>The Create Wizard helps you gather the information necessary to create
diff --git a/virtman-icon.diff b/virtman-icon.diff
deleted file mode 100644
index 94ccb6e..0000000
--- a/virtman-icon.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: virt-manager-0.8.4/src/virt-manager.py.in
-===================================================================
---- virt-manager-0.8.4.orig/src/virt-manager.py.in
-+++ virt-manager-0.8.4/src/virt-manager.py.in
-@@ -313,6 +313,7 @@ def main():
-     # Add our icon dir to icon theme
-     icon_theme = gtk.icon_theme_get_default()
-     icon_theme.prepend_search_path(icon_dir)
-+    icon_theme.prepend_search_path(icon_dir + "/hicolor/32x32/action")
- 
-     gtk.gdk.threads_init()
-     setup_glade_i18n()
diff --git a/virtman-keycombo.diff b/virtman-keycombo.diff
index 6424faa..5f5052b 100644
--- a/virtman-keycombo.diff
+++ b/virtman-keycombo.diff
@@ -1,7 +1,7 @@
-Index: virt-manager-0.8.4/src/vmm-details.glade
+Index: virt-manager-0.8.3/src/vmm-details.glade
 ===================================================================
---- virt-manager-0.8.4.orig/src/vmm-details.glade
-+++ virt-manager-0.8.4/src/vmm-details.glade
+--- virt-manager-0.8.3.orig/src/vmm-details.glade
++++ virt-manager-0.8.3/src/vmm-details.glade
 @@ -339,11 +339,85 @@
                        </widget>
                      </child>
@@ -97,11 +97,11 @@ Index: virt-manager-0.8.4/src/vmm-details.glade
                          <property name="visible">True</property>
                        </widget>
                      </child>
-Index: virt-manager-0.8.4/src/virtManager/details.py
+Index: virt-manager-0.8.3/src/virtManager/details.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/details.py
-+++ virt-manager-0.8.4/src/virtManager/details.py
-@@ -288,6 +288,14 @@ class vmmDetails(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/details.py
++++ virt-manager-0.8.3/src/virtManager/details.py
+@@ -259,6 +259,14 @@ class vmmDetails(gobject.GObject):
  
              "on_details_menu_send_cad_activate": self.console.send_key,
              "on_details_menu_send_cab_activate": self.console.send_key,
@@ -116,11 +116,11 @@ Index: virt-manager-0.8.4/src/virtManager/details.py
              "on_details_menu_send_caf1_activate": self.console.send_key,
              "on_details_menu_send_caf2_activate": self.console.send_key,
              "on_details_menu_send_caf3_activate": self.console.send_key,
-Index: virt-manager-0.8.4/src/virtManager/console.py
+Index: virt-manager-0.8.3/src/virtManager/console.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/console.py
-+++ virt-manager-0.8.4/src/virtManager/console.py
-@@ -325,6 +325,22 @@ class vmmConsolePages(gobject.GObject):
+--- virt-manager-0.8.3.orig/src/virtManager/console.py
++++ virt-manager-0.8.3/src/virtManager/console.py
+@@ -321,6 +321,22 @@ class vmmConsolePages(gobject.GObject):
              keys = ["Control_L", "Alt_L", "Delete"]
          elif src.get_name() == "details-menu-send-cab":
              keys = ["Control_L", "Alt_L", "BackSpace"]
diff --git a/virtman-kvm.diff b/virtman-kvm.diff
index 85f28e7..1283d0e 100644
--- a/virtman-kvm.diff
+++ b/virtman-kvm.diff
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.4/src/virtManager/engine.py
+Index: virt-manager-0.8.3/src/virt-manager.py.in
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.4/src/virtManager/engine.py
-@@ -69,7 +69,8 @@ def default_uri():
+--- virt-manager-0.8.3.orig/src/virt-manager.py.in
++++ virt-manager-0.8.3/src/virt-manager.py.in
+@@ -209,7 +209,8 @@ def default_uri():
          tryuri = "xen:///"
      elif (os.path.exists("/usr/bin/qemu") or
            os.path.exists("/usr/bin/qemu-kvm") or
diff --git a/virtman-netcat.diff b/virtman-netcat.diff
index 950ea8f..e15b907 100644
--- a/virtman-netcat.diff
+++ b/virtman-netcat.diff
@@ -1,19 +1,13 @@
-Index: virt-manager-0.8.4/src/virtManager/console.py
+Index: virt-manager-0.8.3/src/virtManager/console.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/console.py
-+++ virt-manager-0.8.4/src/virtManager/console.py
-@@ -515,11 +515,11 @@ class vmmConsolePages(gobject.GObject):
-         #
-         nc_params = "%s %s" % (vncaddr, str(vncport))
-         nc_cmd = [\
--            "nc -q 2>&1 | grep -q 'requires an argument';"
-+            "netcat -q 2>&1 | grep -q 'requires an argument';"
-             "if [ $? -eq 0 ] ; then"
--            "   CMD='nc -q 0 %(nc_params)s';"
-+            "   CMD='netcat -q 0 %(nc_params)s';"
-             "else"
--            "   CMD='nc %(nc_params)s';"
-+            "   CMD='netcat %(nc_params)s';"
-             "fi;"
-             "$CMD;" % {'nc_params': nc_params}
-         ]
+--- virt-manager-0.8.3.orig/src/virtManager/console.py
++++ virt-manager-0.8.3/src/virtManager/console.py
+@@ -505,7 +505,7 @@ class vmmConsolePages(gobject.GObject):
+         if username:
+             argv += ['-l', username]
+ 
+-        argv += [ server, "nc", vncaddr, str(vncport) ]
++        argv += [ server, "netcat", vncaddr, str(vncport) ]
+ 
+         logging.debug("Creating SSH tunnel: %s" % argv)
+ 
diff --git a/virtman-vminstall.diff b/virtman-vminstall.diff
index fe7df82..e1416ad 100644
--- a/virtman-vminstall.diff
+++ b/virtman-vminstall.diff
@@ -1,8 +1,8 @@
-Index: virt-manager-0.8.4/src/virtManager/engine.py
+Index: virt-manager-0.8.3/src/virtManager/engine.py
 ===================================================================
---- virt-manager-0.8.4.orig/src/virtManager/engine.py
-+++ virt-manager-0.8.4/src/virtManager/engine.py
-@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag
+--- virt-manager-0.8.3.orig/src/virtManager/engine.py
++++ virt-manager-0.8.3/src/virtManager/engine.py
+@@ -38,7 +38,8 @@ from virtManager.manager import vmmManag
  from virtManager.migrate import vmmMigrateDialog
  from virtManager.details import vmmDetails
  from virtManager.asyncjob import vmmAsyncJob
@@ -12,7 +12,7 @@ Index: virt-manager-0.8.4/src/virtManager/engine.py
  from virtManager.host import vmmHost
  from virtManager.error import vmmErrorDialog
  from virtManager.systray import vmmSystray
-@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject):
+@@ -436,13 +437,27 @@ class vmmEngine(gobject.GObject):
              return False
          return True