Fix error creating QEMU guests (bz #962569)

This commit is contained in:
Cole Robinson 2013-05-15 15:53:31 -04:00
parent 8559ae70dd
commit b1ca0e1efa
2 changed files with 38 additions and 1 deletions

View File

@ -0,0 +1,28 @@
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

@ -20,7 +20,7 @@
%global gitcommit b68faac8 %global gitcommit b68faac8
%define _version 0.10.0 %define _version 0.10.0
%define _release 0.2.git%{gitcommit} %define _release 0.3.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,6 +47,9 @@ 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
Requires: virt-manager-common = %{verrel} Requires: virt-manager-common = %{verrel}
Requires: pygobject3 Requires: pygobject3
@ -114,6 +117,9 @@ machine).
%prep %prep
%setup -q -n virt-manager-%{gitcommit} %setup -q -n virt-manager-%{gitcommit}
# Fix error creating QEMU guests (bz #962569)
%patch0001 -p1
%build %build
%if %{qemu_user} %if %{qemu_user}
%define _qemu_user --qemu-user=%{qemu_user} %define _qemu_user --qemu-user=%{qemu_user}
@ -224,6 +230,9 @@ fi
%changelog %changelog
* Wed May 15 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.3.gitb68faac8
- Fix error creating QEMU guests (bz #962569)
* Thu May 09 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.2.gitb68faac8 * Thu May 09 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-0.2.gitb68faac8
- Fix dep on vte3 (bz #958945) - Fix dep on vte3 (bz #958945)
- Fix dep on virt-manager-common (bz #958730) - Fix dep on virt-manager-common (bz #958730)