From 330b91230265914ad4faa94020705aaa4da38964 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@fedoraproject.org>
Date: Fri, 9 May 2008 17:56:14 +0000
Subject: [PATCH] Set default disk image dir to /var/lib/libvirt/images

---
 virt-manager-0.5.4-image-dir.patch | 30 ++++++++++++++++++++++++++++++
 virt-manager.spec                  |  9 +++++++--
 2 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 virt-manager-0.5.4-image-dir.patch

diff --git a/virt-manager-0.5.4-image-dir.patch b/virt-manager-0.5.4-image-dir.patch
new file mode 100644
index 0000000..6d6d3e8
--- /dev/null
+++ b/virt-manager-0.5.4-image-dir.patch
@@ -0,0 +1,30 @@
+diff -rup virt-manager-0.5.4.orig/src/virtManager/config.py virt-manager-0.5.4.new/src/virtManager/config.py
+--- virt-manager-0.5.4.orig/src/virtManager/config.py	2008-03-10 20:17:51.000000000 -0400
++++ virt-manager-0.5.4.new/src/virtManager/config.py	2008-05-09 13:42:21.000000000 -0400
+@@ -37,6 +37,9 @@ CONSOLE_KEYGRAB_MOUSEOVER = 2
+ DEFAULT_XEN_IMAGE_DIR = "/var/lib/xen/images"
+ DEFAULT_XEN_SAVE_DIR = "/var/lib/xen/dump"
+ 
++DEFAULT_VIRT_IMAGE_DIR = "/var/lib/libvirt/images"
++DEFAULT_VIRT_SAVE_DIR = "/var/lib/libvirt"
++
+ class vmmConfig:
+     def __init__(self, appname, appversion, gconf_dir, glade_dir, icon_dir, data_dir):
+         self.appname = appname
+@@ -332,12 +335,16 @@ class vmmConfig:
+     def get_default_image_dir(self, connection):
+         if connection.get_type() == "Xen":
+             return DEFAULT_XEN_IMAGE_DIR
++        elif os.access(DEFAULT_VIRT_IMAGE_DIR, os.W_OK):
++            return DEFAULT_VIRT_IMAGE_DIR
+         else:
+             return os.getcwd()
+ 
+     def get_default_save_dir(self, connection):
+         if connection.get_type() == "Xen":
+             return DEFAULT_XEN_SAVE_DIR
++        elif os.access(DEFAULT_VIRT_SAVE_DIR, os.W_OK):
++            return DEFAULT_VIRT_SAVE_DIR
+         else:
+             return os.getcwd()
+ 
diff --git a/virt-manager.spec b/virt-manager.spec
index dc88f6d..86a343a 100644
--- a/virt-manager.spec
+++ b/virt-manager.spec
@@ -8,7 +8,7 @@
 
 Name: virt-manager
 Version: 0.5.4
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Summary: Virtual Machine Manager
 
 Group: Applications/Emulators
@@ -19,6 +19,7 @@ Source1: %{name}.pam
 Source2: %{name}.console
 Patch1: %{name}-%{version}-polkit-root.patch
 Patch2: %{name}-%{version}-i18n.patch
+Patch3: %{name}-%{version}-image-dir.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 # These two are just the oldest version tested
@@ -38,7 +39,7 @@ Requires: gnome-python2-gnomekeyring >= 2.15.4
 # Minimum we've tested with
 Requires: libxml2-python >= 2.6.23
 # Required to install Xen guests
-Requires: python-virtinst >= 0.300.2
+Requires: python-virtinst >= 0.300.3-6.fc9
 # Required for loading the glade UI
 Requires: pygtk2-libglade
 # Required for our graphics which are currently SVG format
@@ -72,6 +73,7 @@ API.
 %setup -q
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %configure
@@ -162,6 +164,9 @@ fi
 %{_datadir}/dbus-1/services/%{name}.service
 
 %changelog
+* Fri May  9 2008 Daniel P. Berrange <berrange@redhat.com> - 0.5.4-4.fc9
+- Default disk images to /var/lib/libvirt/images
+
 * Thu Apr  3 2008 Daniel P. Berrange <berrange@redhat.com> - 0.5.4-3.fc9
 - Updated sr, de, fi, it, pl translations