diff --git a/virt-v2v-use-appliance-backend.patch b/virt-v2v-use-appliance-backend.patch new file mode 100644 index 0000000..ad461fb --- /dev/null +++ b/virt-v2v-use-appliance-backend.patch @@ -0,0 +1,15 @@ +--- virt-v2v-v0.9.0.old/lib/Sys/VirtConvert/GuestfsHandle.pm 2012-12-06 15:09:51.000000000 +0000 ++++ virt-v2v-v0.9.0/lib/Sys/VirtConvert/GuestfsHandle.pm 2013-07-03 14:48:53.049335387 +0100 +@@ -76,6 +76,12 @@ + my $interface = "ide"; + + $g = Sys::Guestfs->new(); ++ ++ # Fedora-specific patch: The libvirt backend used in Fedora >= ++ # 18 does not support setting iface parameters. Therefore ++ # ensure we are using the direct (appliance) backend. ++ $g->set_attach_method ("appliance"); ++ + foreach my $disk (@{$disks}) { + my ($name, $path, $format) = @$disk; + diff --git a/virt-v2v.spec b/virt-v2v.spec index 4cdb539..2367f84 100644 --- a/virt-v2v.spec +++ b/virt-v2v.spec @@ -1,20 +1,16 @@ Name: virt-v2v Version: 0.9.0 -Release: 2%{?dist}%{?extra_release} +Release: 3%{?dist}%{?extra_release} Summary: Convert a virtual machine to run on KVM -Group: Applications/System License: GPLv2+ and LGPLv2+ URL: http://git.fedorahosted.org/git/virt-v2v.git -Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -# Backported upstream patches -# Naming scheme: ---.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 +Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{version}.tar.gz + +# Non-upstream patch to default to using the appliance backend +# for Fedora >= 18. +Patch1: virt-v2v-use-appliance-backend.patch # Unfortunately, despite really being noarch, we have to make virt-v2v arch # dependent to avoid build failures on architectures where libguestfs isn't @@ -45,6 +41,7 @@ BuildRequires: perl(Module::Pluggable) BuildRequires: perl(Net::HTTPS) BuildRequires: perl(Net::SSL) BuildRequires: perl(Sys::Guestfs) +BuildRequires: perl(Sys::Syslog) BuildRequires: perl(Sys::Virt) BuildRequires: perl(Term::ProgressBar) BuildRequires: perl(URI) @@ -93,6 +90,8 @@ variety of guest operating systems from libvirt-managed hosts and VMware ESX. %prep %setup -q -n %{name}-v%{version} +%patch1 -p1 + %build %{__perl} Build.PL @@ -103,7 +102,6 @@ variety of guest operating systems from libvirt-managed hosts and VMware ESX. %install -rm -rf %{buildroot} ./Build install \ --destdir %{buildroot} \ --installdirs vendor \ @@ -136,13 +134,7 @@ cp v2v/virt-v2v.db $statedir/ ./Build test -%clean -rm -rf %{buildroot} - - %files -f %{name}.lang -%defattr(-,root,root,-) - %doc TODO.txt %doc META.yml %doc ChangeLog @@ -168,6 +160,13 @@ rm -rf %{buildroot} %changelog +* Wed Jul 3 2013 Richard W.M. Jones - 0.9.0-3 +- Default to using the appliance backend, since in Fedora >= 18 the + libvirt backend doesn't support the 'iface' parameter which virt-v2v + requires. +- Add BR perl(Sys::Syslog), required to run the tests. +- Remove some cruft from the spec file. + * Fri Feb 15 2013 Fedora Release Engineering - 0.9.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild