From dadf3bffa0951b0c33b7a514748ca51e969a8d17 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Sat, 1 Aug 2009 09:46:10 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/virt-manager?expand=0&rev=27 --- virt-manager-0.7.0.tar.bz2 | 3 - virt-manager-0.8.0.tar.bz2 | 3 + virt-manager.changes | 5 + virt-manager.spec | 214 +++---------------------------------- virtinst-0.400.3.tar.bz2 | 3 - virtinst-0.500.0.tar.bz2 | 3 + virtman-cdrom.diff | 20 ++-- virtman-desktop.diff | 25 +++-- virtman-help.diff | 7 +- virtman-kvm.diff | 9 +- virtman-manager.diff | 11 +- virtman-netcat.diff | 9 +- virtman-pointer.diff | 11 +- virtman-vminstall.diff | 15 +-- 14 files changed, 85 insertions(+), 253 deletions(-) delete mode 100644 virt-manager-0.7.0.tar.bz2 create mode 100644 virt-manager-0.8.0.tar.bz2 delete mode 100644 virtinst-0.400.3.tar.bz2 create mode 100644 virtinst-0.500.0.tar.bz2 diff --git a/virt-manager-0.7.0.tar.bz2 b/virt-manager-0.7.0.tar.bz2 deleted file mode 100644 index b9d17c19..00000000 --- a/virt-manager-0.7.0.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:077a14e2b73a6eab7aea71197be5674b89b267c8e7778764ec6af5b96885ab1a -size 1394648 diff --git a/virt-manager-0.8.0.tar.bz2 b/virt-manager-0.8.0.tar.bz2 new file mode 100644 index 00000000..0d22229b --- /dev/null +++ b/virt-manager-0.8.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:af4ae8a497f17cbc2e856dc35715d7b33858e1260bfe2faa325a3e858a20687d +size 1392631 diff --git a/virt-manager.changes b/virt-manager.changes index f774aaaf..de050813 100644 --- a/virt-manager.changes +++ b/virt-manager.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 30 20:03:21 MDT 2009 - carnold@novell.com + +- Update to virt-manager version 0.8.0 + ------------------------------------------------------------------- Fri Jun 12 12:15:53 MDT 2009 - carnold@novell.com diff --git a/virt-manager.spec b/virt-manager.spec index cb9c930e..f63b5e2a 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -1,5 +1,5 @@ # -# spec file for package virt-manager (Version 0.7.0) +# spec file for package virt-manager (Version 0.8.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -22,11 +22,11 @@ Name: virt-manager %define gsysconfdir /etc %define gconftool /usr/bin/gconftool-2 %define virtinst_maj 0 -%define virtinst_min 400 -%define virtinst_rel 3 +%define virtinst_min 500 +%define virtinst_rel 0 %define virtinst_name virtinst-%{virtinst_maj}.%{virtinst_min}.%{virtinst_rel} -Version: 0.7.0 -Release: 2 +Version: 0.8.0 +Release: 1 Summary: Virtual Machine Manager Group: System/Monitoring License: LGPL v2.1 or later @@ -123,7 +123,7 @@ Authors: %patch3 -p1 %patch4 -p1 %patch5 -p1 -%patch6 -p1 +#%patch6 -p1 %patch7 -p1 %patch8 -p1 pushd $RPM_BUILD_DIR/%{virtinst_name} @@ -156,15 +156,16 @@ rm -f $RPM_BUILD_ROOT/usr/share/locale/sr/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/pt_BR/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/sr@latin/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/locale/zh_CN/LC_MESSAGES/virtinst.mo +rm -f $RPM_BUILD_ROOT/usr/share/locale/es/LC_MESSAGES/virtinst.mo rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-clone.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-image.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-install.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man1/virt-convert.1 rm -f $RPM_BUILD_ROOT/usr/share/man/man5/virt-image.5 -# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.400.3-py2.?.egg-info +# rm -f $RPM_BUILD_ROOT/usr/share/virt-manager/virtinst-0.500.3-py2.?.egg-info popd -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a -rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la +#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.a +#rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/sparkline.la # Unsupport languages: rm -rf $RPM_BUILD_ROOT/usr/share/locale/or %find_gconf_schemas @@ -179,11 +180,12 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; # sed -i '\^/usr/share/gnome/help/^d' %{name}.lang %clean -# rm -rf $RPM_BUILD_ROOT +rm -rf $RPM_BUILD_ROOT %pre -f %{name}.schemas_pre %preun -f %{name}.schemas_preun + %posttrans -f %{name}.schemas_posttrans %files -f %{name}.lst @@ -191,11 +193,12 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; %doc COPYING AUTHORS ChangeLog # %dir %attr(775,root,root) /etc/gconf # %dir %attr(775,root,root) /etc/gconf/schemas -#%config %{gsysconfdir}/gconf/schemas/%{name}.schemas +# %config %{gsysconfdir}/gconf/schemas/%{name}.schemas +%dir %{_datadir}/gconf +%dir %{_datadir}/gconf/schemas %config %{_datadir}/gconf/schemas/%{name}.schemas %{_bindir}/%{name} %{_libexecdir}/%{name}-launch -%{_libdir}/%{name}/* %dir %{_datadir}/%{name} %{_datadir}/%{name}/*.glade %dir %{_datadir}/%{name}/pixmaps @@ -223,9 +226,7 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; %dir %{_datadir}/%{name}/virtconv/parsers %{_datadir}/%{name}/virtconv/parsers/*.py %{_datadir}/%{name}/virtconv/parsers/*.pyc -%{_datadir}/%{name}/virtinst-0.400.3-py2.6.egg-info -%dir %{_libdir}/%{name} -%{_libdir}/%{name}/* +%{_datadir}/%{name}/virtinst-0.500.0-py2.6.egg-info %doc %{_datadir}/gnome/help/%{name}/C/figures/*.png %doc %{_datadir}/gnome/help/%{name}/C/*.xml # FIXME: autobuild complains that these are unowned (not true...) @@ -234,186 +235,3 @@ sed -i -e 's/Categories=.*/Categories=Qt;X-SuSE-YaST;X-SuSE-YaST-Virtualization; %dir %{_datadir}/applications/YaST2 %changelog -* Fri Jun 12 2009 carnold@novell.com -- Fixed build issue with virt-manager.schemas location. -- Changed .gz files to .bz2 files to save space and quiet RPMLINT -* Thu Apr 30 2009 dpmerrill@novell.com -- Add dbus-1-x11 dependency for minimal installations -* Tue Apr 21 2009 dpmerrill@novell.com -- Update to virt-manager-0.7.0 and virtinst-0.400.3 - Improved KVM support - Added support for libvirt storage/network pools - Details and Console windows are combined - Added scaling for VM console window - Simple VM migration support -* Sun Mar 01 2009 ro@suse.de -- move sr@Latn to sr@latin -* Wed Dec 03 2008 dpmerrill@suse.de -- Remove ia64 from build architectures (bnc#455989) -* Tue Nov 11 2008 dpmerrill@novell.com -- Add Requires python-urlgrabber for non Xen installations -- Change transport from nc to netcat for ssh connections -* Mon Nov 03 2008 dpmerrill@novell.com -- Add Requires librsvg for minimal template -* Wed Sep 10 2008 ro@suse.de -- fix build -* Thu May 22 2008 dpmerrill@novell.com -- (bnc#383979) add vm-install to Requires section -* Fri May 16 2008 ro@suse.de -- move python install to install section in specfile -- fix build without root privileges -* Tue Apr 29 2008 dpmerrill@novell.com -- Corrected gconf calls in spec file to fix build errors -* Tue Apr 29 2008 dpmerrill@novell.com -- Added needsrootforbuild to spec file to fix build errors -* Fri Apr 25 2008 dpmerrill@novell.com -- Fixed SendKey "PrintScreen" option -* Thu Apr 24 2008 dpmerrill@novell.com -- Added python-gtk-devel and python-gobject2-devel to spec file - to reflect changes in OpenSuse11.0 -* Tue Apr 22 2008 dpmerrill@novell.com -- Changed desktop file for starting from KDE (bnc#377277) -* Mon Apr 21 2008 dpmerrill@novell.com -- Changed "SendKey" to send "Delete" instead of "Del" (bnc#381897) -* Fri Apr 18 2008 dpmerrill@novell.com -- Added vncViewerMaxRetries to prevent showing expected libvirt - exceptions from cluttering the error log (bnc#366792) -* Wed Apr 09 2008 dpmerrill@novell.com -- Changed vnc settings to prevent screen-saver lockup (bnc#253264) -- Added read-only option in Details->Hardware for adding cdroms - to prevent libvirt exceptions. (bnc#368204) (bnc#361990) -* Fri Apr 04 2008 dpmerrill@novell.com -- Removed Virtual Network tab from host details page (bnc#364514) -* Wed Apr 02 2008 dpmerrill@novell.com -- Fixed adding a virtual network to a vm (bnc#302663) - Also fixed errors caused by new dbus-1 release -* Wed Mar 12 2008 dpmerrill@novell.com -- Added warning for attempting multiple installs (bnc#368278) -* Wed Feb 20 2008 dpmerrill@novell.com -- Added virtman-timewatch to minimize window after -- inactivity to work around memory leaks in GTK and DBus -- bnc#287366 (L3) -* 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:///" -- bnc#358400 -* Sun Feb 03 2008 dpmerrill@novell.com -- Added virtman-xen-uri.diff to fix problem starting vnc. -- virtman was getting confused between "xen" and "xen:///" uris. -- bnc#358397 -* Sat Feb 02 2008 dpmerrill@novell.com -- Added virtman-dbus-query.diff to work around a hal/dbus -- bug that crashes on QueryCapabilities() -- bnc#358324 -* Thu Jan 31 2008 dpmerrill@novell.com -- Added virtinst to finish resolving run-time dependencies -- bnc#355826 -- bnc#356999 -* Wed Jan 23 2008 dpmerrill@novell.com -- Changed package requirements in spec file Requires section. -- pygtk2 -> python-gtk -- gnome-python2-gconf -> python-gnome -- dbus-python -> dbus-1-python -- gnome-python2-gnomekeyring -> removed -- gnome-python2-gnomevfs -> removed -- python-virtinst -> removed -- pygtk2-libglade -> removed -- gtk-vnc-python -> python-gtk-vnc -* Sat Jan 19 2008 dpmerrill@novell.com -- Added new virt-manager version (0.5.3) to sle10-sp2-i386 -- (FATE Feature #302140) -* Thu Aug 16 2007 ccoffing@novell.com -- Update virt-manager to match vm-install changes due to #279153. -* Mon Jul 09 2007 ccoffing@novell.com -- Properly attach and detach CDs to running VM. (#289393) -* Wed May 09 2007 ccoffing@novell.com -- Update .desktop with proper group. (#258600) -* Fri May 04 2007 ccoffing@novell.com -- Fix syntax error ("NOne" should be "None"), which caused - unnecessary VNC connection failures in virt-manager. (#237406) -* Wed May 02 2007 ccoffing@novell.com -- Drop virtman-xenstored-thrashing.diff, to change the default - refresh rate from 5 seconds back to 1 second. It is more - important to have up-to-date knowledge of VMs (to ensure consoles - can be opened, etc) rather than trying to lessen virt-manager's - processor load. (#270761) -* Tue Apr 10 2007 ccoffing@novell.com -- Remove code that (incorrectly) guesses the vnc port. (#259692) -- Do not refresh GUI every second (which causes xenstored to not - thrash so badly, which makes virt-manager more responsive and - less likely to time out or lock up). Partial fix for #237406. -- Import changeset 440, which makes virt-manager honor dom0's - keymap. (#241149) -- Revert patch for bug #244772, because it causes lockups, as - noted in bug #261110. -- Fix attaching disks to running VM. (#238986) -* Wed Mar 28 2007 ccoffing@novell.com -- Update icon filename. -* Tue Mar 13 2007 ccoffing@novell.com -- Import threading and timer tick patches from upstream to improve - stability. (#237406 and others) -- Do not offer QEMU option. (#254083) -* Mon Mar 12 2007 ccoffing@novell.com -- Update virt-manager to match changes in vm-install's disk class, - due to bug #247849. -* Fri Mar 09 2007 ccoffing@novell.com -- Make Ctrl+Alt release the mouse cursor (#252998). -* Thu Mar 08 2007 ccoffing@novell.com -- Add release to "Requires: xen-tools", to prevent mixing with - pre-beta 5. (#238986, #252495) -* Fri Mar 02 2007 ccoffing@novell.com -- Disable gtk-menu-bar-accel when VM has focus, to allow VM to get - F10 key. (#240001) -* Tue Feb 27 2007 ccoffing@novell.com -- Update to 0.3.1. -- "Requires: librsvg" (#250156) -- Re-use vm-install's disk UI, to allow disks to be added/removed - from xend-managed VMs (currently only for running VMs). (#238986) -* Thu Feb 22 2007 ccoffing@novell.com -- If Xen isn't running, put up error window instead of raising. - (#244772) -* Tue Feb 13 2007 ccoffing@novell.com -- Update to latest hg; grabs mouse for better mouse tracking. - (#240387) -- Don't lose mouse grab on every keystroke -- Disable menubar & toolbar when pointer is in VM window, to avoid - key conflicts. (#240001) -- Fix syntax to avoid deprecation warnings (don't raise strings). -- YaST integration: default to managing on-box; detach from yast - control center. -* Mon Jan 29 2007 ccoffing@novell.com -- Fix desktop file. (#239275) -- Update to 0.3.0 (updated translations; no code changes) -* Mon Jan 22 2007 ccoffing@novell.com -- Fix desktop file, so icon shows in YaST. (#237046) -- Clean up macros in spec file. -* Fri Jan 19 2007 ccoffing@novell.com -- Use temporary icon until real ones arrive. -- Update to changeset 371 to fix VNC issues. -* Wed Jan 17 2007 ccoffing@novell.com -- Fix BuildRequires and paths to work with both SLES10 and STABLE. -* Fri Jan 12 2007 ccoffing@novell.com -- Fix sysconfdir path. -- Add desktop file. -* Thu Jan 11 2007 ccoffing@novell.com -- Add to SLES 10 SP1 (fate #301181) -- Update to virt-manager 0.2.6. -- Fix type_register deprecation warnings. -* Tue Oct 24 2006 ccoffing@novell.com -- Initial package. -- Replace virt-inst with xen-vm-install (part of xen-tools-install) diff --git a/virtinst-0.400.3.tar.bz2 b/virtinst-0.400.3.tar.bz2 deleted file mode 100644 index 98bb20d6..00000000 --- a/virtinst-0.400.3.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:065d98b8effcc281d5f4e666885db70ff90651bcde98f79bc9cdc53f04380abf -size 244258 diff --git a/virtinst-0.500.0.tar.bz2 b/virtinst-0.500.0.tar.bz2 new file mode 100644 index 00000000..0f2b7afa --- /dev/null +++ b/virtinst-0.500.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:85f625115a667d8de68d02922daf0b2fd88888d2de25da15260c7891db67f638 +size 291909 diff --git a/virtman-cdrom.diff b/virtman-cdrom.diff index 6709abd8..a0612bdf 100644 --- a/virtman-cdrom.diff +++ b/virtman-cdrom.diff @@ -1,12 +1,12 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/addhardware.py virt-manager-0.7.0//src/virtManager/addhardware.py ---- virt-manager-0.7.0.orig//src/virtManager/addhardware.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/addhardware.py 2009-04-21 10:07:18.000000000 -0600 -@@ -1021,6 +1021,8 @@ - model.append(["virtio", virtinst.VirtualDisk.DEVICE_DISK, - gtk.STOCK_HARDDISK, "Virtio Disk"]) +Index: virt-manager-0.8.0/src/virtManager/addhardware.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/addhardware.py ++++ virt-manager-0.8.0/src/virtManager/addhardware.py +@@ -1301,6 +1301,7 @@ class vmmAddHardware(gobject.GObject): + if self.vm.get_hv_type().lower() == "kvm": + add_dev("virtio", virtinst.VirtualDisk.DEVICE_DISK, "Virtio Disk") if self.vm.get_connection().get_type().lower() == "xen": -+ model.append(["xen", virtinst.VirtualDisk.DEVICE_CDROM, -+ gtk.STOCK_CDROM, "Virtual disk (read only)"]) - model.append(["xen", virtinst.VirtualDisk.DEVICE_DISK, - gtk.STOCK_HARDDISK, "Virtual disk"]) ++ add_dev("xen", virtinst.VirtualDisk.DEVICE_CDROM, "Virtual disk (read only)") + add_dev("xen", virtinst.VirtualDisk.DEVICE_DISK, "Virtual disk") + def populate_input_model(self, model): diff --git a/virtman-desktop.diff b/virtman-desktop.diff index 90404f38..1998664d 100644 --- a/virtman-desktop.diff +++ b/virtman-desktop.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/Makefile.am virt-manager-0.7.0//src/Makefile.am ---- virt-manager-0.7.0.orig//src/Makefile.am 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/Makefile.am 2009-04-16 16:31:18.000000000 -0600 -@@ -14,7 +14,7 @@ +Index: virt-manager-0.8.0/src/Makefile.am +=================================================================== +--- virt-manager-0.8.0.orig/src/Makefile.am ++++ virt-manager-0.8.0/src/Makefile.am +@@ -14,7 +14,7 @@ libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -10,10 +11,11 @@ diff -Nuar virt-manager-0.7.0.orig//src/Makefile.am virt-manager-0.7.0//src/Make desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop -diff -Nuar virt-manager-0.7.0.orig//src/Makefile.in virt-manager-0.7.0//src/Makefile.in ---- virt-manager-0.7.0.orig//src/Makefile.in 2009-03-09 21:39:01.000000000 -0600 -+++ virt-manager-0.7.0//src/Makefile.in 2009-04-16 16:31:47.000000000 -0600 -@@ -248,7 +248,7 @@ +Index: virt-manager-0.8.0/src/Makefile.in +=================================================================== +--- virt-manager-0.8.0.orig/src/Makefile.in ++++ virt-manager-0.8.0/src/Makefile.in +@@ -258,7 +258,7 @@ libexec_DATA_IN = $(PACKAGE)-launch.in libexec_SCRIPTS = $(PACKAGE)-launch gladedir = $(pkgdatadir) glade_DATA = $(wildcard $(srcdir)/*.glade) @@ -22,9 +24,10 @@ diff -Nuar virt-manager-0.7.0.orig//src/Makefile.in virt-manager-0.7.0//src/Make desktop_DATA_IN = $(PACKAGE).desktop.in.in desktop_DATA = $(PACKAGE).desktop dbusdir = $(datadir)/dbus-1/services -diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in virt-manager-0.7.0//src/virt-manager.desktop.in.in ---- virt-manager-0.7.0.orig//src/virt-manager.desktop.in.in 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virt-manager.desktop.in.in 2009-04-16 16:35:46.000000000 -0600 +Index: virt-manager-0.8.0/src/virt-manager.desktop.in.in +=================================================================== +--- virt-manager-0.8.0.orig/src/virt-manager.desktop.in.in ++++ virt-manager-0.8.0/src/virt-manager.desktop.in.in @@ -1,9 +1,16 @@ [Desktop Entry] _Name=Virtual Machine Manager diff --git a/virtman-help.diff b/virtman-help.diff index 91a76060..c234ef97 100644 --- a/virtman-help.diff +++ b/virtman-help.diff @@ -1,6 +1,7 @@ -diff -Nuar virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml ---- virt-manager-0.7.0.orig//help/virt-manager/C/virt-manager.xml 2009-03-09 21:38:36.000000000 -0600 -+++ virt-manager-0.7.0//help/virt-manager/C/virt-manager.xml 2009-04-24 17:02:36.000000000 -0600 +Index: virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml +=================================================================== +--- virt-manager-0.8.0.orig/help/virt-manager/C/virt-manager.xml ++++ virt-manager-0.8.0/help/virt-manager/C/virt-manager.xml @@ -821,218 +821,9 @@ The Create Wizard The Create Wizard helps you gather the information necessary to create diff --git a/virtman-kvm.diff b/virtman-kvm.diff index 31445bd6..5ddd72cf 100644 --- a/virtman-kvm.diff +++ b/virtman-kvm.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virt-manager.py.in virt-manager-0.7.0//src/virt-manager.py.in ---- virt-manager-0.7.0.orig//src/virt-manager.py.in 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virt-manager.py.in 2009-04-21 14:24:51.000000000 -0600 -@@ -192,7 +192,8 @@ +Index: virt-manager-0.8.0/src/virt-manager.py.in +=================================================================== +--- virt-manager-0.8.0.orig/src/virt-manager.py.in ++++ virt-manager-0.8.0/src/virt-manager.py.in +@@ -196,7 +196,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-manager.diff b/virtman-manager.diff index abe27de4..22095561 100644 --- a/virtman-manager.diff +++ b/virtman-manager.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/manager.py virt-manager-0.7.0//src/virtManager/manager.py ---- virt-manager-0.7.0.orig//src/virtManager/manager.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/manager.py 2009-04-24 15:14:21.000000000 -0600 -@@ -656,6 +656,15 @@ +Index: virt-manager-0.8.0/src/virtManager/manager.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/manager.py ++++ virt-manager-0.8.0/src/virtManager/manager.py +@@ -624,6 +624,15 @@ class vmmManager(gobject.GObject): vmlist = self.window.get_widget("vm-list") selection = vmlist.get_selection() active = selection.get_selected() @@ -17,7 +18,7 @@ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/manager.py virt-manager-0.7. if active[1] != None: parent = active[0].iter_parent(active[1]) # return the connection of the currently selected vm, or the -@@ -810,7 +819,14 @@ +@@ -768,7 +777,14 @@ class vmmManager(gobject.GObject): return False def new_vm(self, ignore=None): diff --git a/virtman-netcat.diff b/virtman-netcat.diff index 84eb405d..a19e2262 100644 --- a/virtman-netcat.diff +++ b/virtman-netcat.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py ---- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:13:49.000000000 -0600 -@@ -1233,7 +1233,7 @@ +Index: virt-manager-0.8.0/src/virtManager/details.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/details.py ++++ virt-manager-0.8.0/src/virtManager/details.py +@@ -1308,7 +1308,7 @@ class vmmDetails(gobject.GObject): argv = ["ssh", "ssh", "-p", sshport] if username: argv += ['-l', username] diff --git a/virtman-pointer.diff b/virtman-pointer.diff index cc7ceb4b..8acc9394 100644 --- a/virtman-pointer.diff +++ b/virtman-pointer.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7.0//src/virtManager/details.py ---- virt-manager-0.7.0.orig//src/virtManager/details.py 2009-04-20 10:21:46.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/details.py 2009-04-20 10:27:37.000000000 -0600 -@@ -218,10 +218,10 @@ +Index: virt-manager-0.8.0/src/virtManager/details.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/details.py ++++ virt-manager-0.8.0/src/virtManager/details.py +@@ -205,10 +205,10 @@ class vmmDetails(gobject.GObject): self.window.get_widget("console-vnc-viewport").add(self.vncViewer) self.vncViewer.realize() self.vncTunnel = None @@ -15,4 +16,4 @@ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/details.py virt-manager-0.7. + self.vncViewer.set_keyboard_grab(False) self.vncViewer.set_pointer_grab(True) - self.scale_type = self.config.get_console_scaling() + self.scale_type = self.vm.get_console_scaling() diff --git a/virtman-vminstall.diff b/virtman-vminstall.diff index 67f2bdd3..faaf9aba 100644 --- a/virtman-vminstall.diff +++ b/virtman-vminstall.diff @@ -1,7 +1,8 @@ -diff -Nuar virt-manager-0.7.0.orig//src/virtManager/engine.py virt-manager-0.7.0//src/virtManager/engine.py ---- virt-manager-0.7.0.orig//src/virtManager/engine.py 2009-03-09 21:38:37.000000000 -0600 -+++ virt-manager-0.7.0//src/virtManager/engine.py 2009-04-17 11:48:12.000000000 -0600 -@@ -33,7 +33,8 @@ +Index: virt-manager-0.8.0/src/virtManager/engine.py +=================================================================== +--- virt-manager-0.8.0.orig/src/virtManager/engine.py ++++ virt-manager-0.8.0/src/virtManager/engine.py +@@ -37,7 +37,8 @@ from virtManager.preferences import vmmP from virtManager.manager import vmmManager from virtManager.details import vmmDetails from virtManager.asyncjob import vmmAsyncJob @@ -10,8 +11,8 @@ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/engine.py virt-manager-0.7.0 +from vminstall.gtk.interface import VMCreate as vmmCreate from virtManager.host import vmmHost from virtManager.error import vmmErrorDialog - import virtManager.util as util -@@ -341,13 +342,24 @@ + from virtManager.systray import vmmSystray +@@ -390,13 +391,24 @@ class vmmEngine(gobject.GObject): return False return True @@ -38,4 +39,4 @@ diff -Nuar virt-manager-0.7.0.orig//src/virtManager/engine.py virt-manager-0.7.0 + message_box.destroy() def add_connection(self, uri, readOnly=None, autoconnect=False): - conn = vmmConnection(self.get_config(), uri, readOnly) + conn = vmmConnection(self.get_config(), uri, readOnly,