diff --git a/.gitignore b/.gitignore index 89a1267..57dd1b8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ virt-manager-0.8.4.tar.gz /virt-manager-0.8.5.tar.gz +/virt-manager-0.8.6.tar.gz diff --git a/sources b/sources index 42a1097..d95478b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -038668be9e5edcb86ebae2495240b6ff virt-manager-0.8.5.tar.gz +456812517c9c595de3c358865db0e465 virt-manager-0.8.6.tar.gz diff --git a/virt-manager-0.8.5-ignore-python27-deprecation-warnings.patch b/virt-manager-0.8.5-ignore-python27-deprecation-warnings.patch deleted file mode 100644 index d96f639..0000000 --- a/virt-manager-0.8.5-ignore-python27-deprecation-warnings.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/virt-manager.py.in b/src/virt-manager.py.in -index fefa1c3..c285dac 100755 ---- a/src/virt-manager.py.in -+++ b/src/virt-manager.py.in -@@ -273,7 +273,7 @@ def main(): - # on as if all were fine. Ultimately bad stuff happens, - # so lets catch it here & get the hell out... - import warnings -- warnings.filterwarnings('error', module='gtk') -+ warnings.filterwarnings('error', module='gtk', append=True) - try: - import gobject - diff --git a/virt-manager-0.8.5-packagekit-packages.patch b/virt-manager-0.8.5-packagekit-packages.patch deleted file mode 100644 index a6f474f..0000000 --- a/virt-manager-0.8.5-packagekit-packages.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -rup virt-manager-0.8.4/src/virtManager/engine.py new/src/virtManager/engine.py ---- virt-manager-0.8.4/src/virtManager/engine.py 2010-03-24 11:21:39.000000000 -0400 -+++ new/src/virtManager/engine.py 2010-03-24 19:57:56.000000000 -0400 -@@ -49,8 +49,8 @@ import virtManager.util as util - - # List of packages to look for via packagekit at first startup. - # If this list is empty, no attempt to contact packagekit is made --LIBVIRT_DAEMON = "" --HV_PACKAGE = "" -+LIBVIRT_DAEMON = "libvirt" -+HV_PACKAGE = "qemu-system-x86" - OTHER_PACKAGES = [] - PACKAGEKIT_PACKAGES = [] - diff --git a/virt-manager-0.8.5-perms-qemu-user.patch b/virt-manager-0.8.5-perms-qemu-user.patch deleted file mode 100644 index 1751f62..0000000 --- a/virt-manager-0.8.5-perms-qemu-user.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -rup virt-manager-0.8.1/src/virtManager/uihelpers.py new/src/virtManager/uihelpers.py ---- virt-manager-0.8.1/src/virtManager/uihelpers.py 2009-12-03 16:15:01.000000000 -0500 -+++ new/src/virtManager/uihelpers.py 2009-12-03 17:15:09.101994000 -0500 -@@ -38,7 +38,7 @@ OPTICAL_MEDIA_KEY = 4 - # may use a nonroot user, so simply changing this will cause several UI - # pieces to attempt to verify that permissions are correct. Eventually this - # should be exposed via capabilities so we can determine this programmatically. --QEMU_SYSTEM_EMULATOR_USER = "root" -+QEMU_SYSTEM_EMULATOR_USER = "qemu" - - ############################################################## - # Initialize an error object to use for validation functions # diff --git a/virt-manager-0.8.6-no-console-autolaunch.patch b/virt-manager-0.8.6-no-console-autolaunch.patch new file mode 100644 index 0000000..b9f8447 --- /dev/null +++ b/virt-manager-0.8.6-no-console-autolaunch.patch @@ -0,0 +1,18 @@ +# HG changeset patch +# User Cole Robinson +# Date 1295638999 18000 +# Node ID f2b2601affd15a20c13d5bebfd00da7de9bc6f06 +# Parent 3d890b23da24d88482f4cd9b621df49867b68cd6 +manager: Don't always launch consoles for running domains, dumb regression + +diff -r 3d890b23da24 -r f2b2601affd1 src/virtManager/manager.py +--- a/src/virtManager/manager.py Fri Jan 21 11:30:38 2011 -0500 ++++ b/src/virtManager/manager.py Fri Jan 21 14:43:19 2011 -0500 +@@ -721,6 +721,7 @@ + if (self.config.get_console_popup() != 2 or + vm.is_management_domain()): + self.emit("action-refresh-console", uri, vmuuid) ++ return + + # user has requested consoles on all vms + gtype = vm.get_graphics_console()[0] diff --git a/virt-manager.spec b/virt-manager.spec index 5bdb206..73d432c 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -7,7 +7,7 @@ %define _extra_release %{?dist:%{dist}}%{!?dist:%{?extra_release:%{extra_release}}} Name: virt-manager -Version: 0.8.5 +Version: 0.8.6 Release: 1%{_extra_release} Summary: Virtual Machine Manager @@ -17,13 +17,8 @@ URL: http://virt-manager.org/ Source0: http://virt-manager.org/download/sources/%{name}/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch -# Check QEMU permissions against the qemu user -Patch1: %{name}-%{version}-perms-qemu-user.patch -# Virt package names we should ask to install -Patch2: %{name}-%{version}-packagekit-packages.patch -# Don't override the "ignore deprecation warnings" default, which lead to a -# C-assertion failure of pygtk2 on startup under python 2.7 (bz 620216): -Patch3: %{name}-%{version}-ignore-python27-deprecation-warnings.patch +# Don't autolaunch console for all running VMs +Patch1: %{name}-%{version}-no-console-autolaunch.patch # These two are just the oldest version tested Requires: pygtk2 >= 1.99.12-6 @@ -44,7 +39,7 @@ Requires: gnome-python2-gnomekeyring >= 2.15.4 # Minimum we've tested with Requires: libxml2-python >= 2.6.23 # Absolutely require this version or later -Requires: python-virtinst >= 0.500.4 +Requires: python-virtinst >= 0.500.5 # Required for loading the glade UI Requires: pygtk2-libglade # Required for our graphics which are currently SVG format @@ -56,13 +51,15 @@ Requires: scrollkeeper # For console widget Requires: gtk-vnc-python >= 0.3.8 # For local authentication against PolicyKit -# Fedora 12 has no need for a client agent. +# Fedora 12 has no need for a client agent %if 0%{?fedora} == 11 Requires: PolicyKit-authentication-agent %endif %if 0%{?fedora} >= 9 && 0%{?fedora} < 11 Requires: PolicyKit-gnome %endif +# For spice widget +Requires: spice-gtk-python BuildRequires: gettext BuildRequires: scrollkeeper @@ -84,14 +81,15 @@ management API. %prep %setup -q %patch1 -p1 -%patch2 -p1 -%patch3 -p1 %build -%configure +%configure --without-tui \ + --with-qemu-user=qemu \ + --with-preferred-distros=fedora15 \ + --with-libvirt-package-names=libvirt \ + --with-kvm-packages=qemu-system-x86 make %{?_smp_mflags} - %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT @@ -163,6 +161,16 @@ fi %{_datadir}/dbus-1/services/%{name}.service %changelog +* Wed Feb 2 2010 Cole Robinson - 0.8.6-1.fc15 +- Update to 0.8.6 +- SPICE support (requires spice-gtk) (Marc-André Lureau) +- Option to configure CPU model +- Option to configure CPU topology +- Save and migration cancellation (Wen Congyang) +- Save and migration progress reporting +- Option to enable bios boot menu +- Option to configure direct kernel/initrd boot + * Wed Aug 25 2010 Cole Robinson - 0.8.5-1.fc15 - Update to 0.8.5 - Improved save/restore support