From e552489164f5a713d2e808988a323be1cff55193 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Aug 25 2010 17:15:02 +0000 Subject: Update to 0.500.4 --- diff --git a/.gitignore b/.gitignore index a49e33b..1b525d0 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ virtinst-0.500.3.tar.gz +/virtinst-0.500.4.tar.gz diff --git a/python-virtinst.spec b/python-virtinst.spec index 284464b..9ecbc1b 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -1,3 +1,5 @@ +# -*- rpm-spec -*- + %{!?python_sitelib: %define python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} # This macro is used for the continuous automated builds. It just @@ -8,21 +10,18 @@ %define appname virtinst -%if 0%{?fedora} >= 9 +%if 0%{?fedora} >= 9 || 0%{?rhel} >= 6 %define with_egg 1 %else %define with_egg 0 %endif + Summary: Python modules and utilities for installing virtual machines Name: python-%{appname} -Version: 0.500.3 -Release: 5%{_extra_release} +Version: 0.500.4 +Release: 1%{_extra_release} Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -# Keep windows CDROM attached for second install stage -Patch1: %{appname}-%{version}-fix-windows-cdrom.patch -# Fix pool source listing in virt-manager -Patch2: %{appname}-%{version}-poolsource-check.patch License: GPLv2+ Group: Development/Libraries @@ -34,13 +33,13 @@ Provides: virt-clone Provides: virt-image Provides: virt-pack Provides: virt-convert -Requires: libvirt-python >= 0.4.5-2.fc10 +Requires: libvirt-python >= 0.2.0 Requires: urlgrabber Requires: libxml2-python Requires: python-urlgrabber Requires: libselinux-python BuildRequires: gettext -BuildRequires: python-devel +BuildRequires: python %description virtinst is a module that helps build and install libvirt based virtual @@ -50,8 +49,6 @@ and install new VMs) and virt-clone (clone an existing virtual machine). %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -59,10 +56,6 @@ python setup.py build %install rm -rf $RPM_BUILD_ROOT python setup.py install -O1 --root=$RPM_BUILD_ROOT -# Back compat in case people hardcoded old /usr/sbin/virt-install location -mkdir -p $RPM_BUILD_ROOT/%{_sbindir} -ln -s ../bin/virt-install $RPM_BUILD_ROOT/%{_sbindir}/virt-install - %find_lang %{appname} || echo 0 %clean @@ -80,13 +73,20 @@ rm -rf $RPM_BUILD_ROOT %endif %{_mandir}/man1/* %{_mandir}/man5/* -%{_sbindir}/virt-install %{_bindir}/virt-install %{_bindir}/virt-clone %{_bindir}/virt-image %{_bindir}/virt-convert %changelog +* Wed Aug 25 2010 Cole Robinson - 0.500.4-1.fc14 +- New virt-install --console option for specifying virtio console device +- New virt-install --channel option for specifying guest communication channel +- New virt-install --boot option. Allows setting post-install boot + order, direct kernel/initrd boot, and enabling boot device menu. +- New virt-install --initrd-inject option, which enables installation + using a _local_ kickstart file (Colin Walters) + * Thu Jul 22 2010 David Malcolm - 0.500.3-5 - Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild diff --git a/sources b/sources index 1de6eec..d70c6ea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3af83445c645ea7e83c47069087ba23c virtinst-0.500.3.tar.gz +679d591b56fd0c49ea36a49a0beab49a virtinst-0.500.4.tar.gz diff --git a/virtinst-0.500.3-fix-windows-cdrom.patch b/virtinst-0.500.3-fix-windows-cdrom.patch deleted file mode 100644 index 8ae9f4d..0000000 --- a/virtinst-0.500.3-fix-windows-cdrom.patch +++ /dev/null @@ -1,34 +0,0 @@ -# HG changeset patch -# User Cole Robinson -# Date 1277307256 14400 -# Node ID e5ab15cd4c243f9ac2e7bcad77970dbe1c74cb81 -# Parent 1ade3d1eaa72f8b6a097ac79e1fe7b5e66cedbf0 -virt-install: Fix CDROM attach for windows installs - -We were unintentionally dropping the CDROM device for the 2nd stage of the -install. - -diff -r 1ade3d1eaa72 -r e5ab15cd4c24 virtinst/Guest.py ---- a/virtinst/Guest.py Mon Jun 21 11:46:13 2010 -0400 -+++ b/virtinst/Guest.py Wed Jun 23 11:34:16 2010 -0400 -@@ -822,6 +822,10 @@ - ############################ - - def _prepare_install(self, meter): -+ # Empty install dev list -+ # Warning: moving this to cleanup_install breaks continue_install -+ self._install_devices = [] -+ - # Initialize install device list - self._install_devices = self.get_all_devices()[:] - -@@ -838,9 +842,6 @@ - self._set_defaults(self._get_install_devs) - - def _cleanup_install(self): -- # Empty install dev list -- self._install_devices = [] -- - self._installer.cleanup() - - def _create_devices(self, progresscb): diff --git a/virtinst-0.500.3-poolsource-check.patch b/virtinst-0.500.3-poolsource-check.patch deleted file mode 100644 index 8f9fa75..0000000 --- a/virtinst-0.500.3-poolsource-check.patch +++ /dev/null @@ -1,19 +0,0 @@ -# HG changeset patch -# User Cole Robinson -# Date 1276536501 14400 -# Node ID 7870801299a53c6fc8e2d24c30069b66e7dc108e -# Parent 6e5b269b5611f20d7b42d910f17162a97e36aaaf -support: Fix check for findStoragePoolSources - -diff -r 6e5b269b5611 -r 7870801299a5 virtinst/support.py ---- a/virtinst/support.py Wed Jun 09 11:53:57 2010 -0400 -+++ b/virtinst/support.py Mon Jun 14 13:28:21 2010 -0400 -@@ -97,7 +97,7 @@ - }, - - SUPPORT_CONN_FINDPOOLSOURCES : { -- "function" : "virConnect.findPoolSources", -+ "function" : "virConnect.findStoragePoolSources", - }, - - SUPPORT_CONN_KEYMAP_AUTODETECT : {