From 1db73b18783ff2ac51ed08845c7ffa5d42a4d3f2 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 27 May 2013 18:58:13 -0400 Subject: [PATCH] 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) --- .gitignore | 1 + ...fault-for-perms-fix-ignore-bz-962569.patch | 28 ------------------- ...-package-list-used-during-dev-bz-963.patch | 25 ----------------- sources | 2 +- virt-manager.spec | 20 +++++-------- 5 files changed, 9 insertions(+), 67 deletions(-) delete mode 100644 0001-gsettings-Fix-default-for-perms-fix-ignore-bz-962569.patch delete mode 100644 0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch diff --git a/.gitignore b/.gitignore index 29d89a6..33001c0 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ virt-manager-0.8.4.tar.gz /virt-manager-0.9.5.tar.gz /virt-manager-d3f9bc8e.tar.gz /virt-manager-b68faac8.tar.gz +/virt-manager-de1695b2.tar.gz diff --git a/0001-gsettings-Fix-default-for-perms-fix-ignore-bz-962569.patch b/0001-gsettings-Fix-default-for-perms-fix-ignore-bz-962569.patch deleted file mode 100644 index 546b1a4..0000000 --- a/0001-gsettings-Fix-default-for-perms-fix-ignore-bz-962569.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bde9943221c3d78388fb554cc5a2838b05aaa7de Mon Sep 17 00:00:00 2001 -Message-Id: -From: Cole Robinson -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 @@ - Default path for saving screenshots from VMs - - -- -- false -+ -+ [] - Ask about fixing permissions - Whether to ask about fixing path permissions - --- -1.8.2.1 - diff --git a/0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch b/0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch deleted file mode 100644 index 1c98325..0000000 --- a/0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 070e19eab9c04981c4f7e751781654c5b4df337b Mon Sep 17 00:00:00 2001 -Message-Id: <070e19eab9c04981c4f7e751781654c5b4df337b.1368653775.git.crobinso@redhat.com> -From: Cole Robinson -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 - diff --git a/sources b/sources index 6846a33..26b82ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -25c6852dd4adbf362b7035f3d11881c5 virt-manager-b68faac8.tar.gz +2e9346157491dfad166f54962c632a20 virt-manager-de1695b2.tar.gz diff --git a/virt-manager.spec b/virt-manager.spec index 4b532c0..ca0c698 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -18,9 +18,9 @@ # End local config -%global gitcommit b68faac8 +%global gitcommit de1695b2 %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 @@ -47,12 +47,6 @@ BuildArch: noarch # git archive --output virt-manager-%{gitcommit}.tar.gz --prefix virt-manager-%{gitcommit}/ %{gitcommit} 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: pygobject3 Requires: gtk3 @@ -119,11 +113,6 @@ machine). %prep %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 %if %{qemu_user} %define _qemu_user --qemu-user=%{qemu_user} @@ -234,6 +223,11 @@ fi %changelog +* Mon May 27 2013 Cole Robinson - 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 - 0.10.0-0.4.gitb68faac8 - Drop bogus packagekit check for avahi-tools (bz #963472)