Backport upstream patch for RHBZ#670175
This commit is contained in:
parent
64cabf8ad3
commit
3cd090b527
24
virt-v2v-0.7.0-00-f61e2cb5.patch
Normal file
24
virt-v2v-0.7.0-00-f61e2cb5.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
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
|
@ -1,6 +1,6 @@
|
|||||||
Name: virt-v2v
|
Name: virt-v2v
|
||||||
Version: 0.7.0
|
Version: 0.7.0
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
Summary: Convert a virtual machine to run on KVM
|
Summary: Convert a virtual machine to run on KVM
|
||||||
|
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
@ -9,6 +9,14 @@ URL: http://git.fedoraproject.org/git/virt-v2v.git
|
|||||||
Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{version}.tar.gz
|
Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{version}.tar.gz
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||||
|
|
||||||
|
# Backported upstream patches
|
||||||
|
# Naming scheme: <name>-<version>-<local sequence number>-<git commit>.patch
|
||||||
|
# name: virt-v2v
|
||||||
|
# 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
|
# Unfortunately, despite really being noarch, we have to make virt-v2v arch
|
||||||
# dependent to avoid build failures on architectures where libguestfs isn't
|
# dependent to avoid build failures on architectures where libguestfs isn't
|
||||||
# available.
|
# available.
|
||||||
@ -69,6 +77,8 @@ variety of guest operating systems from libvirt-managed hosts and VMware ESX.
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-v%{version}
|
%setup -q -n %{name}-v%{version}
|
||||||
|
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__perl} Build.PL
|
%{__perl} Build.PL
|
||||||
./Build
|
./Build
|
||||||
@ -132,6 +142,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jan 17 2011 Matthew Booth <mbooth@redhat.com> - 0.7.0-2
|
||||||
|
- Fix error using -i libvirtxml (RHBZ#670175)
|
||||||
|
|
||||||
* Thu Nov 4 2010 Matthew Booth <mbooth@redhat.com> - 0.7.0-1
|
* Thu Nov 4 2010 Matthew Booth <mbooth@redhat.com> - 0.7.0-1
|
||||||
- Update to release 0.7.0
|
- Update to release 0.7.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user