Rebase to upstream version 0.7.1

.gitignore

@@ -1,2 +1,3 @@
 virt-v2v-v0.6.1.tar.gz
 /virt-v2v-v0.7.0.tar.gz
+/virt-v2v-v0.7.1.tar.gz

sources

@@ -1 +1 @@
-e93064dbf8726b4407631c5dea476c4e  virt-v2v-v0.7.0.tar.gz
+04ea97d57abf71fcb45eb37528d821a5  virt-v2v-v0.7.1.tar.gz

virt-v2v-0.7.0-00-f61e2cb5.patch

@@ -1,24 +0,0 @@
-commit f61e2cb52990742624391451a53cea9517d52e07
-Author: Matthew Booth <mbooth@redhat.com>
-Date:   Mon Jan 17 16:15:46 2011 +0000
-
-    Fix subclassing of LibVirtXMLSource
-    
-    LibVirtXMLSource was subclassing an invalid class, and consequently didn't have
-    copy_storage defined.
-    
-    Fixes RHBZ#670175
-
-diff --git a/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm b/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm
-index e62d996..ffb9309 100644
---- a/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm
-+++ b/lib/Sys/VirtV2V/Connection/LibVirtXMLSource.pm
-@@ -30,7 +30,7 @@ use Sys::VirtV2V::Util qw(user_message parse_libvirt_volinfo);
- 
- use Locale::TextDomain 'virt-v2v';
- 
--@Sys::VirtV2V::Connection::Source::LibVirtXMLSource::ISA =
-+@Sys::VirtV2V::Connection::LibVirtXMLSource::ISA =
-     qw(Sys::VirtV2V::Connection::Source);
- 
- =pod

virt-v2v.spec

@@ -1,6 +1,6 @@
 Name:           virt-v2v
-Version:        0.7.0
+Version:        0.7.1
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        Convert a virtual machine to run on KVM
 
 Group:          Applications/System
@@ -15,7 +15,6 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 #  version:      the version of virt-v2v the patch was originally rebased to
 #  local seq no: the order the patches should be applied in
 #  git commit:   the first 8 characters of the git commit hash
-Patch0:         virt-v2v-0.7.0-00-f61e2cb5.patch
 
 # Unfortunately, despite really being noarch, we have to make virt-v2v arch
 # dependent to avoid build failures on architectures where libguestfs isn't
@@ -68,6 +67,10 @@ Requires:       libvirt >= 0.8.1
 # For GuestOS transfer image
 Requires:       /usr/bin/mkisofs
 
+# For guest image inspection
+Requires:      /usr/bin/qemu-img
+
+
 %description
 virt-v2v is a tool for converting and importing virtual machines to
 libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a
@@ -77,8 +80,6 @@ variety of guest operating systems from libvirt-managed hosts and VMware ESX.
 %prep
 %setup -q -n %{name}-v%{version}
 
-%patch0 -p1
-
 %build
 %{__perl} Build.PL
 ./Build
@@ -142,6 +143,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jan 27 2011 Matthew Booth <mbooth@redhat.com> - 0.7.1-1
+- Update to release 0.7.1
+
 * Mon Jan 17 2011 Matthew Booth <mbooth@redhat.com> - 0.7.0-2
 - Fix error using -i libvirtxml (RHBZ#670175)