From 015acabcd1f48893e98a14cd1f851b13b12976ed Mon Sep 17 00:00:00 2001
From: Daniel P. Berrange <berrange@fedoraproject.org>
Date: Sep 12 2007 01:31:44 +0000
Subject: Fixed detection of F8 distro layout (rhbz #273781)


---

diff --git a/python-virtinst-0.300.0-fedora8-distro.patch b/python-virtinst-0.300.0-fedora8-distro.patch
new file mode 100644
index 0000000..e909e7d
--- /dev/null
+++ b/python-virtinst-0.300.0-fedora8-distro.patch
@@ -0,0 +1,44 @@
+changeset:   268:6b4684756fcf
+user:        "Daniel P. Berrange <berrange@redhat.com>"
+date:        Tue Sep 11 21:20:02 2007 -0400
+files:       virtinst/DistroManager.py
+description:
+Fix detection of Fedora distros for latest F8 style trees
+
+
+diff -r a6d47ed6c97c -r 6b4684756fcf virtinst/DistroManager.py
+--- a/virtinst/DistroManager.py	Wed Aug 29 18:25:09 2007 -0400
++++ b/virtinst/DistroManager.py	Tue Sep 11 21:20:02 2007 -0400
+@@ -210,6 +210,9 @@ class RedHatImageStore(ImageStore):
+ # Fedora distro check
+ class FedoraImageStore(RedHatImageStore):
+     def isValidStore(self, fetcher, progresscb):
++        if fetcher.hasFile("fedora.css", progresscb):
++            logging.debug("Detected a Fedora distro")
++            return True
+         if fetcher.hasFile("Fedora", progresscb):
+             logging.debug("Detected a Fedora distro")
+             return True
+
+changeset:   269:39d2c56e9895
+tag:         tip
+user:        "Daniel P. Berrange <berrange@redhat.com>"
+date:        Tue Sep 11 21:20:30 2007 -0400
+files:       virtinst/FullVirtGuest.py
+description:
+Fix typo in Fedora 8 distro name
+
+
+diff -r 6b4684756fcf -r 39d2c56e9895 virtinst/FullVirtGuest.py
+--- a/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:02 2007 -0400
++++ b/virtinst/FullVirtGuest.py	Tue Sep 11 21:20:30 2007 -0400
+@@ -34,7 +34,7 @@ class FullVirtGuest(Guest.XenGuest):
+                                           "fedora5": { "label": "Fedora Core 5", "distro": "fedora" }, \
+                                           "fedora6": { "label": "Fedora Core 6", "distro": "fedora" }, \
+                                           "fedora7": { "label": "Fedora 7", "distro": "fedora" }, \
+-                                          "fedora8": { "label": "Fedora 7", "distro": "fedora" }, \
++                                          "fedora8": { "label": "Fedora 8", "distro": "fedora" }, \
+                                           "sles10": { "label": "Suse Linux Enterprise Server", "distro": "suse" }, \
+                                           "generic24": { "label": "Generic 2.4.x kernel" }, \
+                                           "generic26": { "label": "Generic 2.6.x kernel" }, \
+
diff --git a/python-virtinst.spec b/python-virtinst.spec
index 0e3617b..a8872ef 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -11,8 +11,9 @@
 Summary: Python modules for starting Xen guest installations
 Name: python-%{appname}
 Version: 0.300.0
-Release: 1%{_extra_release}
+Release: 2%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
+Patch1: %{name}-%{version}-fedora8-distro.patch
 License: GPL
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -35,6 +36,7 @@ virtinst in a command line mode.
 
 %prep
 %setup -q -n %{appname}-%{version}
+%patch1 -p1
 
 %build
 python setup.py build
@@ -64,7 +66,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-image
 
 %changelog
-* Wed Aug 29 2007 Daniel P. Berrange <berrange@redhat.com> - 0.300.0-1
+* Tue Sep 11 2007 Daniel P. Berrange <berrange@redhat.com> - 0.300.0-2.fc8
+- Fixed detection of Fedora 8 distro trees (rhbz #273781)
+
+* Wed Aug 29 2007 Daniel P. Berrange <berrange@redhat.com> - 0.300.0-1.fc8
 - Updated to 0.300.0
 - Added virt-image tool
 - Switched to calling virsh console and virt-viewer
diff --git a/virtinst-0.200.0-default-arch.patch b/virtinst-0.200.0-default-arch.patch
deleted file mode 100644
index 9766b5d..0000000
--- a/virtinst-0.200.0-default-arch.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -rup virtinst-0.200.0.orig/virtinst/util.py virtinst-0.200.0.new/virtinst/util.py
---- virtinst-0.200.0.orig/virtinst/util.py	2007-07-18 22:04:21.000000000 -0400
-+++ virtinst-0.200.0.new/virtinst/util.py	2007-07-26 10:25:15.000000000 -0400
-@@ -124,7 +124,7 @@ def get_default_arch():
-     arch = os.uname()[4]
-     if arch == "x86_64":
-         return "x86_64"
--    return "i386"
-+    return "i686"
- 
- # this function is directly from xend/server/netif.py and is thus
- # available under the LGPL,