From cc39bd44157b0380252e13a7f637a88f9f162d98 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: May 15 2013 21:38:09 +0000 Subject: Drop bogus packagekit check for avahi-tools (bz #963472) --- 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 new file mode 100644 index 0000000..1c98325 --- /dev/null +++ b/0002-Drop-avahi-tools-package-list-used-during-dev-bz-963.patch @@ -0,0 +1,25 @@ +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/virt-manager.spec b/virt-manager.spec index c5aabb0..4b532c0 100644 --- a/virt-manager.spec +++ b/virt-manager.spec @@ -20,7 +20,7 @@ %global gitcommit b68faac8 %define _version 0.10.0 -%define _release 0.3.git%{gitcommit} +%define _release 0.4.git%{gitcommit} # This macro is used for the continuous automated builds. It just @@ -49,6 +49,8 @@ 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} @@ -119,6 +121,8 @@ machine). # Fix error creating QEMU guests (bz #962569) %patch0001 -p1 +# Drop bogus packagekit check for avahi-tools (bz #963472) +%patch0002 -p1 %build %if %{qemu_user} @@ -230,6 +234,9 @@ fi %changelog +* Wed May 15 2013 Cole Robinson - 0.10.0-0.4.gitb68faac8 +- Drop bogus packagekit check for avahi-tools (bz #963472) + * Wed May 15 2013 Cole Robinson - 0.10.0-0.3.gitb68faac8 - Fix error creating QEMU guests (bz #962569)