Fix default graphics, should be spice+qxl (bz #965864)

Check for libvirt default network package on first run (bz #950329)
Fix changing VM cirrus->QXL (bz #928882)
This commit is contained in:
Cole Robinson 2013-05-27 18:58:13 -04:00
parent cc39bd4415
commit 1db73b1878
5 changed files with 9 additions and 67 deletions

1
.gitignore vendored
View File

@ -9,3 +9,4 @@ virt-manager-0.8.4.tar.gz
/virt-manager-0.9.5.tar.gz /virt-manager-0.9.5.tar.gz
/virt-manager-d3f9bc8e.tar.gz /virt-manager-d3f9bc8e.tar.gz
/virt-manager-b68faac8.tar.gz /virt-manager-b68faac8.tar.gz
/virt-manager-de1695b2.tar.gz

View File

@ -1,28 +0,0 @@
From bde9943221c3d78388fb554cc5a2838b05aaa7de Mon Sep 17 00:00:00 2001
Message-Id: <bde9943221c3d78388fb554cc5a2838b05aaa7de.1368646837.git.crobinso@redhat.com>
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 15 May 2013 15:35:55 -0400
Subject: [PATCH] gsettings: Fix default for perms-fix-ignore (bz 962569)
---
data/org.virt-manager.virt-manager.gschema.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/org.virt-manager.virt-manager.gschema.xml b/data/org.virt-manager.virt-manager.gschema.xml
index 2e4664f..d086a64 100644
--- a/data/org.virt-manager.virt-manager.gschema.xml
+++ b/data/org.virt-manager.virt-manager.gschema.xml
@@ -212,8 +212,8 @@
<description>Default path for saving screenshots from VMs</description>
</key>
- <key name="perms-fix-ignore" type="b">
- <default>false</default>
+ <key name="perms-fix-ignore" type="as">
+ <default>[]</default>
<summary>Ask about fixing permissions</summary>
<description>Whether to ask about fixing path permissions</description>
</key>
--
1.8.2.1

View File

@ -1,25 +0,0 @@
From 070e19eab9c04981c4f7e751781654c5b4df337b Mon Sep 17 00:00:00 2001
Message-Id: <070e19eab9c04981c4f7e751781654c5b4df337b.1368653775.git.crobinso@redhat.com>
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 15 May 2013 17:35:14 -0400
Subject: [PATCH] Drop 'avahi-tools' package list used during dev (bz 963472)
---
virtManager/packageutils.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/virtManager/packageutils.py b/virtManager/packageutils.py
index 6b51ab3..39f5c66 100644
--- a/virtManager/packageutils.py
+++ b/virtManager/packageutils.py
@@ -39,7 +39,6 @@ def check_packagekit(errbox, packages, ishv):
Returns None when we determine nothing useful.
Returns (success, did we just install libvirt) otherwise.
"""
- packages = ["avahi-tools"]
if not packages:
logging.debug("No PackageKit packages to search for.")
return
--
1.8.2.1

View File

@ -1 +1 @@
25c6852dd4adbf362b7035f3d11881c5 virt-manager-b68faac8.tar.gz 2e9346157491dfad166f54962c632a20 virt-manager-de1695b2.tar.gz

View File

@ -18,9 +18,9 @@
# End local config # End local config
%global gitcommit b68faac8 %global gitcommit de1695b2
%define _version 0.10.0 %define _version 0.10.0
%define _release 0.4.git%{gitcommit} %define _release 0.5.git%{gitcommit}
# This macro is used for the continuous automated builds. It just # This macro is used for the continuous automated builds. It just
@ -47,12 +47,6 @@ BuildArch: noarch
# git archive --output virt-manager-%{gitcommit}.tar.gz --prefix virt-manager-%{gitcommit}/ %{gitcommit} # git archive --output virt-manager-%{gitcommit}.tar.gz --prefix virt-manager-%{gitcommit}/ %{gitcommit}
Source: virt-manager-%{gitcommit}.tar.gz Source: virt-manager-%{gitcommit}.tar.gz
# Fix error creating QEMU guests (bz #962569)
Patch0001: 0001-gsettings-Fix-default-for-perms-fix-ignore-bz-962569.patch
# Drop bogus packagekit check for avahi-tools (bz #963472)
Patch0002: 0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Requires: pygobject3 Requires: pygobject3
Requires: gtk3 Requires: gtk3
@ -119,11 +113,6 @@ machine).
%prep %prep
%setup -q -n virt-manager-%{gitcommit} %setup -q -n virt-manager-%{gitcommit}
# Fix error creating QEMU guests (bz #962569)
%patch0001 -p1
# Drop bogus packagekit check for avahi-tools (bz #963472)
%patch0002 -p1
%build %build
%if %{qemu_user} %if %{qemu_user}
%define _qemu_user --qemu-user=%{qemu_user} %define _qemu_user --qemu-user=%{qemu_user}
@ -234,6 +223,11 @@ fi
%changelog %changelog
* Mon May 27 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.5.gitde1695b2
- Fix default graphics, should be spice+qxl (bz #965864)
- Check for libvirt default network package on first run (bz #950329)
- Fix changing VM cirrus->QXL (bz #928882)
* Wed May 15 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.4.gitb68faac8 * Wed May 15 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.4.gitb68faac8
- Drop bogus packagekit check for avahi-tools (bz #963472) - Drop bogus packagekit check for avahi-tools (bz #963472)