rpms/python-virtinst/F-10 virtinst-0.400.3-f12-distro.patch, NONE, 1.1 virtinst-0.400.3-preview-detection.patch, NONE, 1.1 python-virtinst.spec, 1.55, 1.56

[Cole Robinson]

Author: crobinso

Update of /cvs/pkgs/rpms/python-virtinst/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8083

Modified Files:
	python-virtinst.spec 
Added Files:
	virtinst-0.400.3-f12-distro.patch 
	virtinst-0.400.3-preview-detection.patch 
Log Message:
Fix detection of fedora preview trees (bz 499718)
Add F12 to os dictionary


virtinst-0.400.3-f12-distro.patch:
 osdict.py |    7 +++++++
 1 file changed, 7 insertions(+)

--- NEW FILE virtinst-0.400.3-f12-distro.patch ---
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" },

virtinst-0.400.3-preview-detection.patch:
 tests/urltest.py     |    5 +++++
 virtinst/OSDistro.py |    2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

--- NEW FILE virtinst-0.400.3-preview-detection.patch ---
# HG changeset patch
# User Cole Robinson <crobinso at 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:


Index: python-virtinst.spec
===================================================================
RCS file: /cvs/pkgs/rpms/python-virtinst/F-10/python-virtinst.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- python-virtinst.spec	9 Apr 2009 15:45:17 -0000	1.55
+++ python-virtinst.spec	5 Oct 2009 18:06:08 -0000	1.56
@@ -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 (clo
 %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 at 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 at redhat.com> - 0.400.3-3.fc10
 - Fix adding floppy devices (bz 493408)
 - Updated translations (bz 493944, bz 494358)