[virt-v2v/f16] New upstream release 0.8.4

[Matthew Booth]

commit 36b1332657fec16aa0d624d8d9683a85b511fd12
Author: Matthew Booth <mbooth at redhat.com>
Date:   Mon Sep 19 17:45:27 2011 +0100

    New upstream release 0.8.4

 .gitignore                       |    1 +
 sources                          |    2 +-
 virt-v2v-0.8.3-01-bd513aaf.patch |   67 --------------------------------------
 virt-v2v.spec                    |   27 ++++++---------
 4 files changed, 12 insertions(+), 85 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ecd4dd5..f4fa39a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@
 # Source
 /virt-v2v-v0.8.1.tar.gz
 /virt-v2v-v0.8.3.tar.gz
+/virt-v2v-v0.8.4.tar.gz
diff --git a/sources b/sources
index 0c31efb..be20e16 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-125315e4901b2dfae16590a746e35bfc  virt-v2v-v0.8.3.tar.gz
+d16952ccc7ddd06497cee289893494ff  virt-v2v-v0.8.4.tar.gz
diff --git a/virt-v2v.spec b/virt-v2v.spec
index eeaeffe..90655a8 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -1,6 +1,6 @@
 Name:           virt-v2v
-Version:        0.8.3
-Release:        1%{?dist}
+Version:        0.8.4
+Release:        1%{?dist}%{?extra_release}
 Summary:        Convert a virtual machine to run on KVM
 
 Group:          Applications/System
@@ -16,8 +16,6 @@ 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.
@@ -43,15 +41,12 @@ 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-hivex >= 1.2.2
@@ -62,15 +57,14 @@ Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires:       perl-libguestfs >= 1:1.6.0
 Requires:       perl-hivex >= 1.2.2
 
+# Required for passing flags to get_xml_description
+Requires:       perl(Sys::Virt) >= 0.2.4
+
 # Net::SSL is loaded dynamically by Net::HTTPS in
 # Sys::VirtConvert::Transfer::ESX. The dependency isn't automatically
 # discovered.
 Requires:       perl(Net::SSL)
 
-# Term::ProgressBar is loaded conditionally. The dependency isn't automatically
-# discovered
-Requires:       perl(Term::ProgressBar)
-
 # Need >= 0.8.1 for rpc fix talking to RHEL 5 libvirt
 Requires:       libvirt >= 0.8.1
 
@@ -78,14 +72,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 +87,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
@@ -166,6 +156,9 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Mon Sep 19 2011 Richard W.M. Jones <rjones at redhat.com> - 0.8.4-1
+- New upstream release 0.8.4
+
 * Mon Aug 22 2011 Richard W.M. Jones <rjones at redhat.com> - 0.8.3-1
 - New upstream release 0.8.3.
 - Include upstream patch to fix whitespace problems in PO files.