Hello community,
here is the log from the commit of package virt-manager
checked in at Tue Jul 3 15:21:37 CEST 2007.
--------
--- arch/i386/virt-manager/virt-manager.changes 2007-05-23 22:20:34.000000000 +0200
+++ /mounts/work_src_done/STABLE/virt-manager/virt-manager.changes 2007-07-02 22:56:10.000000000 +0200
@@ -1,0 +2,6 @@
+Mon Jul 2 11:11:50 MDT 2007 - ccoffing@novell.com
+
+- Update to changeset 508.
+- Include virtinst, to support virtual device add/remove.
+
+-------------------------------------------------------------------
Old:
----
virt-manager-0.4.0.tar.bz2
virtman-delete.diff
virtman-typo.diff
New:
----
virtinst.tar.bz2
virt-manager.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ virt-manager.spec ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:48.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:48.000000000 +0200
@@ -12,17 +12,18 @@
Name: virt-manager
URL: http://virt-manager.et.redhat.com
-BuildRequires: autoconf automake gconf2 gettext gtk2-devel python-devel python-gobject2-devel python-gtk-devel scrollkeeper update-desktop-files
+BuildRequires: autoconf automake gconf2 gettext gtk2-devel intltool python-devel python-gobject2-devel python-gtk-devel scrollkeeper update-desktop-files
# Only for directory ownership:
BuildRequires: libgnome yast2
-License: GNU General Public License (GPL)
+License: GPL v2 or later
Group: System/Monitoring
Autoreqprov: yes
Version: 0.4.0
-Release: 10
+Release: 27
Summary: Virtual Machine Manager
-Source0: virt-manager-0.4.0.tar.bz2
-Source1: rhpl-exception.py
+Source0: virt-manager.tar.bz2
+Source1: virtinst.tar.bz2
+Source2: rhpl-exception.py
Patch10: virtman-desktop.diff
Patch11: virtman-install.diff
Patch12: virtman-type-register.diff
@@ -31,8 +32,6 @@
Patch15: virtman-limit-popup.diff
Patch16: virtman-edit.diff
Patch17: virtman-wrong-port.diff
-Patch18: virtman-typo.diff
-Patch19: virtman-delete.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
ExclusiveArch: %ix86 x86_64
Requires: python-gtk
@@ -42,7 +41,7 @@
Requires: libxml2-python
Requires: vte
Requires: librsvg
-Requires: xen-tools >= 3.0.4_13138-0.10
+Requires: vm-install
Requires: gconf2
%gconf_schemas_prereq
@@ -60,7 +59,8 @@
Jeremy Katz
%prep
-%setup -q
+%setup -q -n virt-manager--devel
+%setup -D -T -b 1 -n virt-manager--devel
%patch10 -p1
%patch11 -p1
%patch12 -p1
@@ -69,23 +69,24 @@
%patch15 -p1
#%patch16 -p1 # re-port... or not?
%patch17 -p1
-%patch18 -p1
-%patch19 -p1
%build
-autoreconf -i
+intltoolize
+autoreconf -if
%configure
make
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+mkdir $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
+install -m644 ../virtinst--devel/virtinst/*.py $RPM_BUILD_ROOT%{_datadir}/virt-manager/virtinst/
+install -m644 %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/virt-manager/exception.py
rm -f $RPM_BUILD_ROOT%{_libdir}/virt-manager/sparkline.{a,la}
-install -m644 %SOURCE1 $RPM_BUILD_ROOT%{_datadir}/virt-manager/exception.py
%find_gconf_schemas
%find_lang %{name}
cat %{name}.schemas_list %{name}.lang >%{name}.lst
-%suse_update_desktop_file %{name} X-SuSE-YaST-Virtualization
+%suse_update_desktop_file -r %{name} X-SuSE-YaST X-SuSE-YaST-Virtualization
%clean
test ! -z "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != "/" && rm -rf $RPM_BUILD_ROOT
@@ -111,12 +112,17 @@
%{_datadir}/virt-manager/*.py
%dir %{_datadir}/virt-manager/virtManager
%{_datadir}/virt-manager/virtManager/*.py
+%dir %{_datadir}/virt-manager/virtinst
+%{_datadir}/virt-manager/virtinst/*.py
%dir %{_datadir}/virt-manager/vncViewer
%{_datadir}/virt-manager/vncViewer/*.py
%{_datadir}/applications/YaST2/virt-manager.desktop
%{_datadir}/dbus-1/services/virt-manager.service
%changelog
+* Mon Jul 02 2007 - ccoffing@novell.com
+- Update to changeset 508.
+- Include virtinst, to support virtual device add/remove.
* Wed May 23 2007 - ccoffing@novell.com
- Could not delete VM through menu. (#272013)
* Tue May 22 2007 - ccoffing@novell.com
++++++ virt-manager-0.4.0.tar.bz2 -> virt-manager.tar.bz2 ++++++
++++ 71171 lines of diff (skipped)
++++++ virtman-console-keys.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: virt-manager-0.4.0/src/virtManager/console.py
+Index: virt-manager--devel/src/virtManager/console.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/console.py
-+++ virt-manager-0.4.0/src/virtManager/console.py
+--- virt-manager--devel.orig/src/virtManager/console.py
++++ virt-manager--devel/src/virtManager/console.py
@@ -49,6 +49,8 @@ class vmmConsole(gobject.GObject):
self.vm = vm
@@ -23,10 +23,10 @@
self.vncViewer.connect("pointer-grabbed", self.notify_grabbed)
self.vncViewer.connect("pointer-ungrabbed", self.notify_ungrabbed)
-Index: virt-manager-0.4.0/src/vncViewer/vnc.py
+Index: virt-manager--devel/src/vncViewer/vnc.py
===================================================================
---- virt-manager-0.4.0.orig/src/vncViewer/vnc.py
-+++ virt-manager-0.4.0/src/vncViewer/vnc.py
+--- virt-manager--devel.orig/src/vncViewer/vnc.py
++++ virt-manager--devel/src/vncViewer/vnc.py
@@ -190,7 +190,7 @@ class GRFBViewer(gtk.DrawingArea):
"keyboard-ungrabbed": (gobject.SIGNAL_RUN_FIRST, gobject.TYPE_NONE, []),
}
@@ -44,7 +44,7 @@
self.accel_groups = gtk.accel_groups_from_object(topwin)
self.preferred_encoding = (rfb.ENCODING_RAW, rfb.ENCODING_DESKTOP_RESIZE)
# Current impl of draw_solid is *far* too slow to be practical
-@@ -460,6 +461,8 @@ class GRFBViewer(gtk.DrawingArea):
+@@ -458,6 +459,8 @@ class GRFBViewer(gtk.DrawingArea):
gtk.gdk.keyboard_grab(self.window, False, long(0))
for g in self.accel_groups:
self.topwin.remove_accel_group(g)
@@ -53,7 +53,7 @@
self.gtk_settings = gtk.settings_get_default()
self.gtk_settings_accel = self.gtk_settings.get_property('gtk-menu-bar-accel')
self.gtk_settings.set_property('gtk-menu-bar-accel', None)
-@@ -470,6 +473,8 @@ class GRFBViewer(gtk.DrawingArea):
+@@ -468,6 +471,8 @@ class GRFBViewer(gtk.DrawingArea):
gtk.gdk.keyboard_ungrab()
for g in self.accel_groups:
self.topwin.add_accel_group(g)
++++++ virtman-desktop.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,11 +1,11 @@
-Index: virt-manager-0.4.0/src/virt-manager.desktop.in
+Index: virt-manager--devel/src/virt-manager.desktop.in.in
===================================================================
---- virt-manager-0.4.0.orig/src/virt-manager.desktop.in
-+++ virt-manager-0.4.0/src/virt-manager.desktop.in
+--- virt-manager--devel.orig/src/virt-manager.desktop.in.in
++++ virt-manager--devel/src/virt-manager.desktop.in.in
@@ -1,9 +1,15 @@
[Desktop Entry]
- Name=Virtual Machine Manager
--Comment=The virtual machine management tool
+ _Name=Virtual Machine Manager
+-_Comment=The virtual machine management tool
-Icon=::ICONDIR::/::PACKAGE::-icon.svg
-Exec=::PACKAGE::
+GenericName=The virtual machine management tool
@@ -22,16 +22,16 @@
+X-SuSE-YaST-RootOnly=true
+X-SuSE-YaST-Geometry=
+X-SuSE-YaST-SortKey=
-Index: virt-manager-0.4.0/src/Makefile.am
+Index: virt-manager--devel/src/Makefile.am
===================================================================
---- virt-manager-0.4.0.orig/src/Makefile.am
-+++ virt-manager-0.4.0/src/Makefile.am
+--- virt-manager--devel.orig/src/Makefile.am
++++ virt-manager--devel/src/Makefile.am
@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch
gladedir = $(pkgdatadir)
glade_DATA = $(wildcard $(srcdir)/*.glade)
-desktopdir = $(datadir)/applications
+desktopdir = $(datadir)/applications/YaST2/
- desktop_SOURCES = $(PACKAGE).desktop.in
+ desktop_SOURCES = $(PACKAGE).desktop.in.in
desktop_DATA = $(PACKAGE).desktop
++++++ virtman-detach-yast.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.4.0/src/virt-manager.py.in
+Index: virt-manager--devel/src/virt-manager.py.in
===================================================================
---- virt-manager-0.4.0.orig/src/virt-manager.py.in
-+++ virt-manager-0.4.0/src/virt-manager.py.in
-@@ -177,6 +177,8 @@ def main():
+--- virt-manager--devel.orig/src/virt-manager.py.in
++++ virt-manager--devel/src/virt-manager.py.in
+@@ -188,6 +188,8 @@ def main():
optParser = OptionParser()
optParser.add_option("--profile", dest="profile", help="Generate runtime performance profile stats", metavar="FILE")
optParser.set_defaults(uuid=None)
@@ -11,7 +11,7 @@
optParser.add_option("-c", "--connect", dest="uri",
help="Connect to hypervisor at URI", metavar="URI")
optParser.add_option("--no-dbus", action="store_true", dest="nodbus",
-@@ -228,6 +230,23 @@ def main():
+@@ -239,6 +241,23 @@ def main():
logging.warning("Could not connection to session bus, disabling DBus service " + \
str(sys.exc_info()[0]) + " " + str(sys.exc_info()[1]))
@@ -35,11 +35,11 @@
# Finally start the app for real
show_engine(engine, options.show, options.uri, options.uuid)
if options.profile != None:
-Index: virt-manager-0.4.0/src/virtManager/engine.py
+Index: virt-manager--devel/src/virtManager/engine.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/engine.py
-+++ virt-manager-0.4.0/src/virtManager/engine.py
-@@ -278,7 +278,7 @@ class vmmEngine:
+--- virt-manager--devel.orig/src/virtManager/engine.py
++++ virt-manager--devel/src/virtManager/engine.py
+@@ -277,7 +277,7 @@ class vmmEngine:
return self.connections[uri]["windowDetails"][uuid]
def show_manager(self, uri):
++++++ virtman-install.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -7,7 +7,7 @@
from virtManager.console import vmmConsole
from virtManager.asyncjob import vmmAsyncJob
-from virtManager.create import vmmCreate
-+from xen.install.gui.gui import VMCreate as vmmCreate
++from vminstall.gtk.interface import VMCreate as vmmCreate
from virtManager.serialcon import vmmSerialConsole
from virtManager.error import vmmErrorDialog
from virtManager.host import vmmHost
++++++ virtman-limit-popup.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,7 +1,7 @@
-Index: virt-manager-0.4.0/src/virtManager/console.py
+Index: virt-manager--devel/src/virtManager/console.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/console.py
-+++ virt-manager-0.4.0/src/virtManager/console.py
+--- virt-manager--devel.orig/src/virtManager/console.py
++++ virt-manager--devel/src/virtManager/console.py
@@ -47,6 +47,7 @@ class vmmConsole(gobject.GObject):
self.window = gtk.glade.XML(config.get_glade_dir() + "/vmm-console.glade", "vmm-console", domain="virt-manager")
self.config = config
@@ -10,22 +10,13 @@
topwin = self.window.get_widget("vmm-console")
sens = (self.window.get_widget("menubar2"),
-@@ -123,6 +124,10 @@ class vmmConsole(gobject.GObject):
-
+@@ -135,6 +136,9 @@ class vmmConsole(gobject.GObject):
def notify_grabbed(self, src):
topwin = self.window.get_widget("vmm-console")
-+ topwin.set_title(_("Press Ctrl+Alt to release pointer.") + " " + self.title)
+ topwin.set_title(_("Press Ctrl+Alt to release pointer.") + " " + self.title)
+ if not self.grab_notifications:
+ return
+ self.grab_notifications -= 1
- try:
- bus = dbus.SessionBus()
- noteSvr = bus.get_object("org.freedesktop.Notifications", "/org/freedesktop/Notifications")
-@@ -141,7 +146,6 @@ class vmmConsole(gobject.GObject):
- 5 * 1000);
- except Exception, e:
- pass
-- topwin.set_title(_("Press Ctrl+Alt to release pointer.") + " " + self.title)
- def notify_ungrabbed(self, src):
- topwin = self.window.get_widget("vmm-console")
+ if self.config.show_console_grab_notify():
+ try:
++++++ virtman-type-register.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,62 +1,62 @@
-Index: virt-manager-0.4.0/src/virtManager/connect.py
+Index: virt-manager--devel/src/virtManager/connect.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/connect.py
-+++ virt-manager-0.4.0/src/virtManager/connect.py
+--- virt-manager--devel.orig/src/virtManager/connect.py
++++ virt-manager--devel/src/virtManager/connect.py
@@ -99,4 +99,3 @@ class vmmConnect(gobject.GObject):
self.close()
self.emit("completed", uri, readOnly)
-gobject.type_register(vmmConnect)
-Index: virt-manager-0.4.0/src/virtManager/connection.py
+Index: virt-manager--devel/src/virtManager/connection.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/connection.py
-+++ virt-manager-0.4.0/src/virtManager/connection.py
-@@ -569,5 +569,4 @@ class vmmConnection(gobject.GObject):
+--- virt-manager--devel.orig/src/virtManager/connection.py
++++ virt-manager--devel/src/virtManager/connection.py
+@@ -578,5 +578,4 @@ class vmmConnection(gobject.GObject):
uuid.append('-')
return "".join(uuid)
-gobject.type_register(vmmConnection)
-Index: virt-manager-0.4.0/src/virtManager/console.py
+Index: virt-manager--devel/src/virtManager/console.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/console.py
-+++ virt-manager-0.4.0/src/virtManager/console.py
-@@ -486,4 +486,3 @@ class vmmConsole(gobject.GObject):
- self.ignorePause = False
+--- virt-manager--devel.orig/src/virtManager/console.py
++++ virt-manager--devel/src/virtManager/console.py
+@@ -509,4 +509,3 @@ class vmmConsole(gobject.GObject):
self.ignorePause = False
+
-gobject.type_register(vmmConsole)
-Index: virt-manager-0.4.0/src/virtManager/details.py
+Index: virt-manager--devel/src/virtManager/details.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/details.py
-+++ virt-manager-0.4.0/src/virtManager/details.py
+--- virt-manager--devel.orig/src/virtManager/details.py
++++ virt-manager--devel/src/virtManager/details.py
@@ -581,4 +581,3 @@ class vmmDetails(gobject.GObject):
self.addhw.show()
-gobject.type_register(vmmDetails)
-Index: virt-manager-0.4.0/src/virtManager/domain.py
+Index: virt-manager--devel/src/virtManager/domain.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/domain.py
-+++ virt-manager-0.4.0/src/virtManager/domain.py
-@@ -569,4 +569,3 @@ class vmmDomain(gobject.GObject):
+--- virt-manager--devel.orig/src/virtManager/domain.py
++++ virt-manager--devel/src/virtManager/domain.py
+@@ -633,4 +633,3 @@ class vmmDomain(gobject.GObject):
memory = int(memory)
self.vm.setMaxMemory(memory)
-gobject.type_register(vmmDomain)
-Index: virt-manager-0.4.0/src/virtManager/manager.py
+Index: virt-manager--devel/src/virtManager/manager.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/manager.py
-+++ virt-manager-0.4.0/src/virtManager/manager.py
-@@ -705,4 +705,3 @@ class vmmManager(gobject.GObject):
+--- virt-manager--devel.orig/src/virtManager/manager.py
++++ virt-manager--devel/src/virtManager/manager.py
+@@ -706,4 +706,3 @@ class vmmManager(gobject.GObject):
vm.resume()
-gobject.type_register(vmmManager)
-Index: virt-manager-0.4.0/src/vncViewer/vnc.py
+Index: virt-manager--devel/src/vncViewer/vnc.py
===================================================================
---- virt-manager-0.4.0.orig/src/vncViewer/vnc.py
-+++ virt-manager-0.4.0/src/vncViewer/vnc.py
+--- virt-manager--devel.orig/src/vncViewer/vnc.py
++++ virt-manager--devel/src/vncViewer/vnc.py
@@ -113,7 +113,6 @@ class GRFBFrameBuffer(rfb.RFBFrameBuffer
def move_cursor(self, x, y):
logging.error("Unsupported move_cursor operation requested")
@@ -73,7 +73,7 @@
class GRFBViewer(gtk.DrawingArea):
-@@ -598,7 +596,6 @@ class GRFBViewer(gtk.DrawingArea):
+@@ -596,7 +594,6 @@ class GRFBViewer(gtk.DrawingArea):
gc = self.window.new_gc()
self.window.draw_drawable(gc, self.fb.get_pixmap(), event.area.x, event.area.y, event.area.x, event.area.y, event.area.width, event.area.height)
++++++ virtman-wrong-port.diff ++++++
--- /var/tmp/diff_new_pack.i12572/_old 2007-07-03 15:20:51.000000000 +0200
+++ /var/tmp/diff_new_pack.i12572/_new 2007-07-03 15:20:51.000000000 +0200
@@ -1,8 +1,8 @@
-Index: virt-manager-0.4.0/src/virtManager/domain.py
+Index: virt-manager--devel/src/virtManager/domain.py
===================================================================
---- virt-manager-0.4.0.orig/src/virtManager/domain.py
-+++ virt-manager-0.4.0/src/virtManager/domain.py
-@@ -434,11 +434,8 @@ class vmmDomain(gobject.GObject):
+--- virt-manager--devel.orig/src/virtManager/domain.py
++++ virt-manager--devel/src/virtManager/domain.py
+@@ -435,11 +435,8 @@ class vmmDomain(gobject.GObject):
port = None
if type == "vnc":
port = self.get_xml_string("/domain/devices/graphics[@type='vnc']/@port")
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org