diff --git a/python-virtinst.spec b/python-virtinst.spec index 28bcdd6..b543409 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -17,7 +17,7 @@ Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} Version: 0.400.3 -Release: 9%{_extra_release} +Release: 10%{_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 @@ -39,6 +39,10 @@ Patch10: %{appname}-%{version}-default-bridge-error.patch Patch11: %{appname}-%{version}-sles-virtio.patch # Don't erroneously set limit for amount of virtio devices (bz 499654) Patch12: %{appname}-%{version}-virtio-dev-limit.patch +# Fix detection of fedora preview trees (bz 499718) +Patch13: %{appname}-%{version}-preview-detection.patch +# Add F12 to os dictionary +Patch14: %{appname}-%{version}-f12-distro.patch License: GPLv2+ Group: Development/Libraries @@ -78,6 +82,8 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %patch10 -p1 %patch11 -p1 %patch12 -p1 +%patch13 -p1 +%patch14 -p1 %build python setup.py build @@ -113,6 +119,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-convert %changelog +* Mon Oct 05 2009 Cole Robinson - 0.400.3-10.fc11 +- Fix detection of fedora preview trees (bz 499718) +- Add F12 to os dictionary + * Sun Sep 13 2009 Cole Robinson - 0.400.3-9.fc11 - Fix parse error when looking for default bridge (bz 506319) - Use virtio for SLES guests (bz 505317) diff --git a/virtinst-0.400.3-f12-distro.patch b/virtinst-0.400.3-f12-distro.patch new file mode 100644 index 0000000..67b4e14 --- /dev/null +++ b/virtinst-0.400.3-f12-distro.patch @@ -0,0 +1,24 @@ +# HG changeset patch +# User Cole Robinson +# Date 1253115773 14400 +# Node ID d8f88998215ae844534b2bf9a7024edc1bf46826 +# Parent 6a398359952bfd8cc62e36afc26bb470862ce42d +osdict: Add 'Fedora 12' entry + +diff -r 6a398359952b -r d8f88998215a virtinst/osdict.py +--- a/virtinst/osdict.py Wed Sep 16 10:53:50 2009 -0400 ++++ b/virtinst/osdict.py Wed Sep 16 11:42:53 2009 -0400 +@@ -179,6 +179,13 @@ + "input" : { "type" : [ (["all"], "tablet") ], + "bus" : [ (["all"], "usb"), ] }, + }}, ++ "fedora12": { "label": "Fedora 12", "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" }, + "sles11": { "label": "Suse Linux Enterprise Server 11", 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 +# 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: