From d91ac0066337ac74518379538e4a09cf1807f527 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 15 Feb 2008 00:43:39 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=13 --- virt-manager.changes | 27 +++++++++++++++++++++++++++ virt-manager.spec | 22 +++++++++++++++++++++- virtman-desktop.diff | 2 +- virtman-detect.diff | 24 ++++++++++++++++++++++++ virtman-pointer.diff | 13 +++++++++++++ virtman-xen-uri.diff | 24 ++++++++++++++++-------- 6 files changed, 102 insertions(+), 10 deletions(-) create mode 100644 virtman-detect.diff create mode 100644 virtman-pointer.diff diff --git a/virt-manager.changes b/virt-manager.changes index 4e779925..63bd5ced 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Thu Feb 14 16:38:43 MST 2008 - dpmerrill@novell.com + +- Changed virtman-xen-uri to correct the case where no +- connection param is passed in and uri is None +- bnc#362013 + +------------------------------------------------------------------- +Tue Feb 12 17:14:08 MST 2008 - dpmerrill@novell.com + +- Changed virtman-desktop and virtman-xen-uri to correct invalid +- parms being passed in from YaST - now sends "-c xen:///" +- bnc#361334 + +------------------------------------------------------------------- +Tue Feb 12 11:39:00 MST 2008 - dpmerrill@novell.com + +- Added virtman-detect to delay Hal signal connection until +- after device detection to prevent start-up delay +- bnc#361202 + +------------------------------------------------------------------- +Mon Feb 11 14:33:45 MST 2008 - dpmerrill@novell.com + +- Added virtman-pointer to set vnc to show only one pointer +- bnc#359799 + ------------------------------------------------------------------- Sun Feb 3 17:59:22 MST 2008 - dpmerrill@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index 96580a04..0bfb78ff 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -9,6 +9,7 @@ # + Name: virt-manager %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} %define gsysconfdir /etc/opt/gnome @@ -18,7 +19,7 @@ Name: virt-manager %define virtinst_rel 2 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} Version: 0.5.3 -Release: 2 +Release: 3 Summary: Virtual Machine Manager Group: System/Monitoring License: GPL v2 or later @@ -31,6 +32,8 @@ Patch0: virtman-desktop.diff Patch1: virtman-dbus-query.diff Patch2: virtman-xen-uri.diff Patch3: virtman-vminstall.diff +Patch4: virtman-pointer.diff +Patch5: virtman-detect.diff # These two are just the oldest version tested # Requires: pygtk2 >= 1.99.12-6 Requires: python-gtk @@ -103,6 +106,8 @@ Authors: %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 +%patch5 -p1 %build # autoreconf -i @@ -186,6 +191,21 @@ fi %dir %{_datadir}/applications/YaST2 %changelog +* Thu Feb 14 2008 dpmerrill@novell.com +- Changed virtman-xen-uri to correct the case where no +- connection param is passed in and uri is None +- bnc#362013 +* Tue Feb 12 2008 dpmerrill@novell.com +- Changed virtman-desktop and virtman-xen-uri to correct invalid +- parms being passed in from YaST - now sends "-c xen:///" +- bnc#361334 +* Tue Feb 12 2008 dpmerrill@novell.com +- Added virtman-detect to delay Hal signal connection until +- after device detection to prevent start-up delay +- bnc#361202 +* Mon Feb 11 2008 dpmerrill@novell.com +- Added virtman-pointer to set vnc to show only one pointer +- bnc#359799 * Sun Feb 03 2008 dpmerrill@novell.com - Added virtman-vminstall for connecting to vm-install - and changed virtman-xen-uri.diff to force "xen:///" diff --git a/virtman-desktop.diff b/virtman-desktop.diff index b73c7d16..a61082a5 100644 --- a/virtman-desktop.diff +++ b/virtman-desktop.diff @@ -29,7 +29,7 @@ Index: virt-manager-0.5.3/src/virt-manager.desktop.in.in Encoding=UTF-8 -Categories=System; +Categories=Qt;X-SuSE-YaST; -+X-SuSE-YaST-Call=/usr/bin/virt-manager -- -c xen --yast ++X-SuSE-YaST-Call=/usr/bin/virt-manager -c xen:/// +X-SuSE-YaST-Group=Virtualization +X-SuSE-YaST-Argument= +X-SuSE-YaST-RootOnly=true diff --git a/virtman-detect.diff b/virtman-detect.diff new file mode 100644 index 00000000..c1225d88 --- /dev/null +++ b/virtman-detect.diff @@ -0,0 +1,24 @@ +diff -Nuar virt-manager-0.5.3.orig/src/virtManager/connection.py virt-manager-0.5.3/src/virtManager/connection.py +--- virt-manager-0.5.3.orig/src/virtManager/connection.py 2008-02-12 11:32:25.000000000 -0700 ++++ virt-manager-0.5.3/src/virtManager/connection.py 2008-02-12 11:36:04.000000000 -0700 +@@ -156,13 +156,17 @@ + hal_object = self.bus.get_object('org.freedesktop.Hal', '/org/freedesktop/Hal/Manager') + self.hal_iface = dbus.Interface(hal_object, 'org.freedesktop.Hal.Manager') + ++ # Find info about all current present media ++ for path in self.hal_iface.FindDeviceByCapability("net"): ++ self._device_added(path) ++ ++ # Connect to signals AFTER FindDeviceByCapability. This leaves a small hole ++ # where we could miss a device add, but FindDeviceByCapability takes ++ # several seconds to execute if the signals are connected in advance... + # Track device add/removes so we can detect newly inserted CD media + self.hal_iface.connect_to_signal("DeviceAdded", self._device_added) + self.hal_iface.connect_to_signal("DeviceRemoved", self._device_removed) + +- # Find info about all current present media +- for path in self.hal_iface.FindDeviceByCapability("net"): +- self._device_added(path) + except: + (type, value, stacktrace) = sys.exc_info () + logging.error("Unable to connect to HAL to list network devices: '%s'" + \ diff --git a/virtman-pointer.diff b/virtman-pointer.diff new file mode 100644 index 00000000..cec4ebbe --- /dev/null +++ b/virtman-pointer.diff @@ -0,0 +1,13 @@ +diff -Nuar virt-manager-0.5.3.orig/src/virtManager/console.py virt-manager-0.5.3/src/virtManager/console.py +--- virt-manager-0.5.3.orig/src/virtManager/console.py 2008-02-11 14:30:07.000000000 -0700 ++++ virt-manager-0.5.3/src/virtManager/console.py 2008-02-11 14:31:06.000000000 -0700 +@@ -84,7 +84,8 @@ + else: + self.vncViewer.set_keyboard_grab(False) + self.vncViewer.set_pointer_grab(False) +- self.vncViewer.set_pointer_local(True) ++ # comment set_pointer_local to prevent 2 pointers in vnc viewer ++ # self.vncViewer.set_pointer_local(True) + + self.vncViewer.connect("vnc-pointer-grab", self.notify_grabbed) + self.vncViewer.connect("vnc-pointer-ungrab", self.notify_ungrabbed) diff --git a/virtman-xen-uri.diff b/virtman-xen-uri.diff index 8e33a9fa..b7085871 100644 --- a/virtman-xen-uri.diff +++ b/virtman-xen-uri.diff @@ -1,7 +1,6 @@ -Index: virt-manager-0.5.3/src/virtManager/connect.py -=================================================================== ---- virt-manager-0.5.3.orig/src/virtManager/connect.py 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virtManager/connect.py 2008-02-03 17:30:24.000000000 -0700 +diff -Nuar virt-manager-0.5.3.orig/src/virtManager/connect.py virt-manager-0.5.3/src/virtManager/connect.py +--- virt-manager-0.5.3.orig/src/virtManager/connect.py 2008-02-12 16:34:35.000000000 -0700 ++++ virt-manager-0.5.3/src/virtManager/connect.py 2008-02-12 16:35:05.000000000 -0700 @@ -95,7 +95,7 @@ pass elif hv == HV_XEN: @@ -11,10 +10,9 @@ Index: virt-manager-0.5.3/src/virtManager/connect.py if os.getuid() != 0: readOnly = True elif conn == CONN_TLS: -Index: virt-manager-0.5.3/src/virt-manager.py.in -=================================================================== ---- virt-manager-0.5.3.orig/src/virt-manager.py.in 2008-01-10 18:17:51.000000000 -0700 -+++ virt-manager-0.5.3/src/virt-manager.py.in 2008-02-03 17:28:34.000000000 -0700 +diff -Nuar virt-manager-0.5.3.orig/src/virt-manager.py.in virt-manager-0.5.3/src/virt-manager.py.in +--- virt-manager-0.5.3.orig/src/virt-manager.py.in 2008-02-12 16:34:35.000000000 -0700 ++++ virt-manager-0.5.3/src/virt-manager.py.in 2008-02-12 16:38:48.000000000 -0700 @@ -172,7 +172,7 @@ if engine.config.get_connections() is None or len(engine.config.get_connections()) == 0: tryuri = None @@ -24,3 +22,13 @@ Index: virt-manager-0.5.3/src/virt-manager.py.in elif os.path.exists("/usr/bin/qemu"): if os.getuid() == 0: tryuri = "qemu:///system" +@@ -248,6 +248,9 @@ + + gtk.window_set_default_icon_from_file(icon_dir + "/" + appname + "-icon.svg") + ++ if options.uri != None and (options.uri.upper() == "XEN" or options.uri.upper().startswith("XEN:")): ++ options.uri = "xen:///" ++ + if options.show and options.uri==None: + raise OptionValueError("can't use --show-* options without --connect") +