From dda7b4074fc7e02502c36ee465d1f7a43a33d4c9 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@fedoraproject.org>
Date: Oct 05 2009 18:06:08 +0000
Subject: Fix detection of fedora preview trees (bz 499718) Add F12 to os dictionary


---

diff --git a/python-virtinst.spec b/python-virtinst.spec
index f80052c..031cdab 100644
--- a/python-virtinst.spec
+++ b/python-virtinst.spec
@@ -11,13 +11,17 @@
 Summary: Python modules and utilities for installing virtual machines
 Name: python-%{appname}
 Version: 0.400.3
-Release: 3%{_extra_release}
+Release: 4%{_extra_release}
 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz
 Patch1: %{appname}-%{version}-fix-virtimage-scratch.patch
 Patch2: %{appname}-%{version}-hostdev-libvirt-calls.patch
 Patch3: %{appname}-%{version}-spanish-trans.patch
 Patch4: %{appname}-%{version}-fix-floppy-dev.patch
 Patch5: %{appname}-%{version}-updated-trans.patch
+# Fix detection of fedora preview trees (bz 499718)
+Patch6: %{appname}-%{version}-preview-detection.patch
+# Add F12 to os dictionary
+Patch7: %{appname}-%{version}-f12-distro.patch
 License: GPLv2+
 Group: Development/Libraries
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -48,6 +52,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine).
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
 
 %build
 python setup.py build
@@ -81,6 +87,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/virt-convert
 
 %changelog
+* Mon Oct 05 2009 Cole Robinson <crobinso@redhat.com> - 0.400.3-4.fc10
+- Fix detection of fedora preview trees (bz 499718)
+- Add F12 to os dictionary
+
 * Thu Apr  9 2009 Cole Robinson <crobinso@redhat.com> - 0.400.3-3.fc10
 - Fix adding floppy devices (bz 493408)
 - Updated translations (bz 493944, bz 494358)
diff --git a/virtinst-0.400.3-f12-distro.patch b/virtinst-0.400.3-f12-distro.patch
new file mode 100644
index 0000000..5c11dfd
--- /dev/null
+++ b/virtinst-0.400.3-f12-distro.patch
@@ -0,0 +1,17 @@
+diff -rup old/virtinst/osdict.py virtinst-0.400.3/virtinst/osdict.py
+--- old/virtinst/osdict.py	2009-10-05 14:04:44.757945000 -0400
++++ virtinst-0.400.3/virtinst/osdict.py	2009-10-05 14:05:00.137730000 -0400
+@@ -107,6 +107,13 @@ OS_TYPES = {\
+                         "input" : { "type" : [ (["all"], "tablet") ],
+                                     "bus"  : [ (["all"], "usb"), ] },
+                      }},
++        "fedora12": { "label": "Fedora 11", "distro": "fedora",
++                      "devices" : {
++                        "disk" : { "bus"   : [ (["kvm"], "virtio") ] },
++                        "net"  : { "model" : [ (["kvm"], "virtio") ] },
++                        "input" : { "type" : [ (["all"], "tablet") ],
++                                    "bus"  : [ (["all"], "usb"), ] },
++                     }},
+         "sles10": { "label": "Suse Linux Enterprise Server",
+                     "distro": "suse" },
+         "debianetch": { "label": "Debian Etch", "distro": "debian" },
diff --git a/virtinst-0.400.3-preview-detection.patch b/virtinst-0.400.3-preview-detection.patch
new file mode 100644
index 0000000..457dfd0
--- /dev/null
+++ b/virtinst-0.400.3-preview-detection.patch
@@ -0,0 +1,37 @@
+# HG changeset patch
+# User Cole Robinson <crobinso@redhat.com>
+# Date 1241725806 14400
+# Node ID 9768e52d4d624f83853f7f23f85402c8a078eb6f
+# Parent  94be2c80832ae1019cc1b3099636a5cb41dd6094
+Fix os_variant autodetection for F11-{alpha/beta/preview}
+
+Prevents URL installs for the stated releases, unless an --os-variant is
+manually specified.
+
+diff -r 94be2c80832a -r 9768e52d4d62 tests/urltest.py
+--- a/tests/urltest.py	Thu May 07 13:47:49 2009 -0400
++++ b/tests/urltest.py	Thu May 07 15:50:06 2009 -0400
+@@ -108,6 +108,11 @@
+         'x86_64': FEDORA_BASEURL % ("10", "x86_64"),
+         'distro': ("linux", "fedora10")
+     },
++    "fedora11test" : {
++        'i386'  : FEDORA_BASEURL % ("test/11-Preview", "i386"),
++        'x86_64': FEDORA_BASEURL % ("test/11-Preview", "x86_64"),
++        'distro': ("linux", "fedora11")
++    },
+     "fedora-rawhide" : {
+         'i386'  : FEDORA_RAWHIDE_BASEURL % ("i386"),
+         'x86_64': FEDORA_RAWHIDE_BASEURL % ("x86_64"),
+diff -r 94be2c80832a -r 9768e52d4d62 virtinst/OSDistro.py
+--- a/virtinst/OSDistro.py	Thu May 07 13:47:49 2009 -0400
++++ b/virtinst/OSDistro.py	Thu May 07 15:50:06 2009 -0400
+@@ -429,7 +429,7 @@
+                 if ver == "development":
+                     self.os_variant = self._latestFedoraVariant()
+                 elif ver:
+-                    self.os_variant = "fedora" + str(ver)
++                    self.os_variant = "fedora" + (str(ver).split("-"))[0]
+ 
+             return ret
+         else: