[virt-v2v] New upstream release 0.8.8
Matthew Booth
mdbooth at fedoraproject.org
Mon Jun 25 12:46:35 UTC 2012
commit 670b6fe9e06ada927d31f421a61ff35dc53e311c
Author: Matthew Booth <mbooth at redhat.com>
Date: Mon Jun 25 13:46:14 2012 +0100
New upstream release 0.8.8
.gitignore | 11 +++---
sources | 2 +-
virt-v2v-0.8.3-01-bd513aaf.patch | 67 --------------------------------------
virt-v2v.spec | 53 ++++++++++++++++--------------
4 files changed, 34 insertions(+), 99 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecd4dd5..99b68b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,12 +1,11 @@
# RPM target directories
-/noarch
/x86_64
# Version-dependent build artifacts
-/.build-0.8.1-1.fc*.log
-/virt-v2v-v0.8.1
-/virt-v2v-0.8.1-1.fc*.src.rpm
+/.build-*.log
+/virt-v2v-v*/
+/virt-v2v-*.src.rpm
+/results_virt-v2v/
# Source
-/virt-v2v-v0.8.1.tar.gz
-/virt-v2v-v0.8.3.tar.gz
+/virt-v2v-v*.tar.gz
diff --git a/sources b/sources
index 0c31efb..b80b4d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-125315e4901b2dfae16590a746e35bfc virt-v2v-v0.8.3.tar.gz
+534cc036325b8de0ebbf6c97f9f02598 virt-v2v-v0.8.8.tar.gz
diff --git a/virt-v2v.spec b/virt-v2v.spec
index ad8b9e7..deb2d05 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -1,6 +1,6 @@
Name: virt-v2v
-Version: 0.8.3
-Release: 2%{?dist}
+Version: 0.8.8
+Release: 1%{?dist}%{?extra_release}
Summary: Convert a virtual machine to run on KVM
Group: Applications/System
@@ -16,12 +16,14 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# local seq no: the order the patches should be applied in
# git commit: the first 8 characters of the git commit hash
-Patch1: virt-v2v-0.8.3-01-bd513aaf.patch
-
# Unfortunately, despite really being noarch, we have to make virt-v2v arch
# dependent to avoid build failures on architectures where libguestfs isn't
# available.
+%if 0%{?rhel} >= 6
+ExclusiveArch: x86_64
+%else
ExclusiveArch: %{ix86} x86_64
+%endif
# Build system direct requirements
BuildRequires: gettext
@@ -41,35 +43,31 @@ BuildRequires: perl(Module::Pluggable)
BuildRequires: perl(Net::HTTPS)
BuildRequires: perl(Net::SSL)
BuildRequires: perl(Sys::Guestfs)
-BuildRequires: perl(Sys::Guestfs::Lib)
BuildRequires: perl(Sys::Virt)
+BuildRequires: perl(Term::ProgressBar)
BuildRequires: perl(URI)
BuildRequires: perl(XML::DOM)
BuildRequires: perl(XML::DOM::XPath)
BuildRequires: perl(XML::Writer)
-# This is a bug introduced by f2c5c8fa337f361057353ffa3fe6539cb1a5823c
-# perl(Term::ProgressBar) should not be a build requirement
-BuildRequires: perl(Term::ProgressBar)
-
-# Need an explicit package dependency for version requires
-BuildRequires: perl-libguestfs >= 1:1.6.0
+BuildRequires: perl-Sys-Guestfs >= 1:1.14.0
BuildRequires: perl-hivex >= 1.2.2
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
-# Need an explicit package dependency for version requires
-Requires: perl-libguestfs >= 1:1.6.0
+# Required for the name optional argument to add_drive_opts
+Requires: perl-Sys-Guestfs >= 1:1.14.0
+
+# Undocumented from antiquity
Requires: perl-hivex >= 1.2.2
-# Net::SSL is loaded dynamically by Net::HTTPS in
-# Sys::VirtConvert::Transfer::ESX. The dependency isn't automatically
-# discovered.
-Requires: perl(Net::SSL)
+# Required for passing flags to get_xml_description
+Requires: perl(Sys::Virt) >= 0.2.4
-# Term::ProgressBar is loaded conditionally. The dependency isn't automatically
-# discovered
-Requires: perl(Term::ProgressBar)
+# Net::SSL and Net::HTTPS are loaded with require rather than use, which
+# rpmbuild doesn't seem to discover automatically.
+Requires: perl(Net::SSL)
+Requires: perl(Net::HTTPS)
# Need >= 0.8.1 for rpc fix talking to RHEL 5 libvirt
Requires: libvirt >= 0.8.1
@@ -78,14 +76,11 @@ Requires: libvirt >= 0.8.1
Requires: /usr/bin/mkisofs
# For guest image inspection
-Requires: /usr/bin/qemu-img
+Requires: /usr/bin/qemu-img
# For ssh transfers
Requires: /usr/bin/ssh
-# For device_map lens
-Requires: augeas-libs => augeas-libs-0.7.2-4
-
%description
virt-v2v is a tool for converting and importing virtual machines to
@@ -96,7 +91,6 @@ 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
@@ -118,6 +112,12 @@ rm -rf %{buildroot}
statedir=%{buildroot}%{_localstatedir}/lib/virt-v2v
mkdir -p $statedir/software
+# Copy Windows dependencies into place
+windir=$statedir/software/windows
+mkdir -p $windir
+
+cp windows/rhsrvany.exe windows/firstboot.bat $windir/
+
mkdir -p %{buildroot}%{_sysconfdir}
cp v2v/virt-v2v.conf %{buildroot}%{_sysconfdir}/
cp v2v/virt-v2v.db $statedir/
@@ -166,6 +166,9 @@ rm -rf %{buildroot}
%changelog
+* Mon Jun 25 2012 Matthew Booth <mbooth at redhat.com> - 0.8.8-1
+- Rebase to upstream version 0.8.8
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.8.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list