diff --git a/.cvsignore b/.cvsignore index 3b897ed..a58f071 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,3 +1,4 @@ virtinst-0.300.1.tar.gz .build*.log *.rpm +virtinst-0.300.2.tar.gz diff --git a/python-virtinst.spec b/python-virtinst.spec index 55a480e..4aac253 100644 --- a/python-virtinst.spec +++ b/python-virtinst.spec @@ -10,12 +10,10 @@ Summary: Python modules for starting Xen guest installations Name: python-%{appname} -Version: 0.300.1 -Release: 3%{_extra_release} +Version: 0.300.2 +Release: 1%{_extra_release}.1 Source0: http://virt-manager.org/download/sources/%{appname}/%{appname}-%{version}.tar.gz -Patch1: %{appname}-%{version}-remove-usb-tablet.patch -Patch2: %{appname}-%{version}-nfs-check.patch -License: GPL +License: GPLv2+ Group: Development/Libraries BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -37,8 +35,6 @@ virtinst in a command line mode. %prep %setup -q -n %{appname}-%{version} -%patch1 -p1 -%patch2 -p1 %build python setup.py build @@ -48,7 +44,7 @@ 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 %{_bindir}/virt-install $RPM_BUILD_ROOT/%{_sbindir}/virt-install +ln -s ../bin/virt-install $RPM_BUILD_ROOT/%{_sbindir}/virt-install %find_lang %{appname} || echo 0 @@ -68,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/virt-image %changelog +* Thu Jan 10 2008 Daniel P. Berrange - 0.300.2-1.fc8.1 +- Update to 0.300.2 release + * Thu Oct 11 2007 Daniel P. Berrange - 0.300.1-3.fc8 - Fix missing file exception check with NFS installs (rhbz #325591) diff --git a/sources b/sources index 73b2bfe..46c809d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ 0424cdd829fda57b7117782f367d4aec virtinst-0.300.1.tar.gz +7ad88b898f970cafe5ad32ccfab4fcf3 virtinst-0.300.2.tar.gz diff --git a/virtinst-0.300.1-nfs-check.patch b/virtinst-0.300.1-nfs-check.patch deleted file mode 100644 index a45bf11..0000000 --- a/virtinst-0.300.1-nfs-check.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r 531b73491ac2 virtinst/DistroManager.py ---- a/virtinst/DistroManager.py Wed Oct 10 14:24:48 2007 -0400 -+++ b/virtinst/DistroManager.py Thu Oct 11 11:39:58 2007 -0400 -@@ -161,7 +161,7 @@ class MountedImageFetcher(ImageFetcher): - if tmpfile is not None: - os.unlink(tmpfile) - return True -- except RuntimeError, e: -+ except Exception, e: - logging.debug("Cannot find file %s" % filename) - return False - diff --git a/virtinst-0.300.1-remove-usb-tablet.patch b/virtinst-0.300.1-remove-usb-tablet.patch deleted file mode 100644 index 1eeff1f..0000000 --- a/virtinst-0.300.1-remove-usb-tablet.patch +++ /dev/null @@ -1,96 +0,0 @@ -Only in virtinst-0.300.1.new: .coverage -diff -rup virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-block.xml virtinst-0.300.1.new/tests/boot-fullyvirt-disk-block.xml ---- virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-block.xml 2007-09-25 11:01:12.000000000 -0400 -+++ virtinst-0.300.1.new/tests/boot-fullyvirt-disk-block.xml 2007-10-04 12:10:00.000000000 -0400 -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff -rup virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-file.xml virtinst-0.300.1.new/tests/boot-fullyvirt-disk-file.xml ---- virtinst-0.300.1.orig/tests/boot-fullyvirt-disk-file.xml 2007-09-25 11:01:12.000000000 -0400 -+++ virtinst-0.300.1.new/tests/boot-fullyvirt-disk-file.xml 2007-10-04 12:10:17.000000000 -0400 -@@ -28,7 +28,7 @@ - - - -- -+ - - - -diff -rup virtinst-0.300.1.orig/tests/install-fullyvirt-disk-block.xml virtinst-0.300.1.new/tests/install-fullyvirt-disk-block.xml ---- virtinst-0.300.1.orig/tests/install-fullyvirt-disk-block.xml 2007-09-25 11:01:12.000000000 -0400 -+++ virtinst-0.300.1.new/tests/install-fullyvirt-disk-block.xml 2007-10-04 12:10:29.000000000 -0400 -@@ -29,7 +29,7 @@ - - - -- -+ - - - -diff -rup virtinst-0.300.1.orig/tests/install-fullyvirt-disk-file.xml virtinst-0.300.1.new/tests/install-fullyvirt-disk-file.xml ---- virtinst-0.300.1.orig/tests/install-fullyvirt-disk-file.xml 2007-09-25 11:01:12.000000000 -0400 -+++ virtinst-0.300.1.new/tests/install-fullyvirt-disk-file.xml 2007-10-04 12:10:37.000000000 -0400 -@@ -29,7 +29,7 @@ - - - -- -+ - - - -diff -rup virtinst-0.300.1.orig/virtinst/FullVirtGuest.py virtinst-0.300.1.new/virtinst/FullVirtGuest.py ---- virtinst-0.300.1.orig/virtinst/FullVirtGuest.py 2007-09-25 11:01:12.000000000 -0400 -+++ virtinst-0.300.1.new/virtinst/FullVirtGuest.py 2007-10-04 12:02:36.000000000 -0400 -@@ -27,6 +27,7 @@ class FullVirtGuest(Guest.XenGuest): - "acpi": True, \ - "apic": True, \ - "continue": False, \ -+ "input": [ "mouse", "ps2"], - "variants": { "rhel2.1": { "label": "Red Hat Enterprise Linux 2.1", "distro": "rhel" }, \ - "rhel3": { "label": "Red Hat Enterprise Linux 3", "distro": "rhel" }, \ - "rhel4": { "label": "Red Hat Enterprise Linux 4", "distro": "rhel" }, \ -@@ -44,6 +45,7 @@ class FullVirtGuest(Guest.XenGuest): - "acpi": True, \ - "apic": True, \ - "continue": True, \ -+ "input": [ "tablet", "usb"], - "variants": { "winxp": { "label": "Microsoft Windows XP", \ - "acpi": False, \ - "apic": False }, \ -@@ -58,6 +60,7 @@ class FullVirtGuest(Guest.XenGuest): - "acpi": True, - "apic": True, - "continue": False, \ -+ "input": [ "mouse", "ps2"], - "variants": { "solaris9": { "label": "Sun Solaris 9" }, \ - "solaris10": { "label": "Sun Solaris 10" }, \ - "freebsd6": { "label": "Free BSD 6.x" }, \ -@@ -68,6 +71,7 @@ class FullVirtGuest(Guest.XenGuest): - "acpi": True, - "apic": True, - "continue": False, -+ "input": [ "mouse", "ps2"], - "variants": { "msdos": { "label": "MS-DOS", \ - "acpi": False, \ - "apic": False }, \ -@@ -161,7 +165,10 @@ class FullVirtGuest(Guest.XenGuest): - os_distro = property(get_os_distro) - - def get_input_device(self): -- return ("tablet", "usb") -+ if self.os_type is None or not FullVirtGuest.OS_TYPES.has_key(self.os_type): -+ return ("mouse", "ps2") -+ input = FullVirtGuest.OS_TYPES[self.os_type]["input"] -+ return (input[0], input[1]) - - def _get_features_xml(self): - ret = "\n"