rpms/virt-v2v/EL-5 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 virt-v2v.spec, 1.1, 1.2
Matthew Booth
mdbooth at fedoraproject.org
Wed Apr 14 17:00:35 UTC 2010
Author: mdbooth
Update of /cvs/pkgs/rpms/virt-v2v/EL-5
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22620
Modified Files:
.cvsignore sources virt-v2v.spec
Log Message:
Update to release 0.4.10
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- .cvsignore 9 Mar 2010 11:20:27 -0000 1.2
+++ .cvsignore 14 Apr 2010 17:00:35 -0000 1.3
@@ -1,4 +1,3 @@
-virt-v2v-0.4.0.tar.gz
-virt-v2v-0.4.0-exechelper-cleanup.patch
-virt-v2v-0.4.0-exechelper-tmpfile.patch
-virt-v2v-0.4.0-remove-fr.patch
+0001-RHEL5-Hardcode-the-location-of-qemu-kvm.patch
+0002-RHEL5-Ignore-ERR_INVALID_STORAGE_POOL-when-checking-.patch
+virt-v2v-0.4.10.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- sources 9 Mar 2010 11:20:27 -0000 1.2
+++ sources 14 Apr 2010 17:00:35 -0000 1.3
@@ -1,4 +1,3 @@
-902efe037084773d48c3e4f0df29aff4 virt-v2v-0.4.0.tar.gz
-c7c9eb9f61c7a08388dbaf841689c8d0 virt-v2v-0.4.0-exechelper-cleanup.patch
-8568d371a2b35468ac93772c3495cf86 virt-v2v-0.4.0-exechelper-tmpfile.patch
-c6be0b669a9e75a7401bcb28cab242b0 virt-v2v-0.4.0-remove-fr.patch
+77b4e9b03664ab2ddc0ca7a517ff1832 0001-RHEL5-Hardcode-the-location-of-qemu-kvm.patch
+cf13c68bf2033f50b4c84cc98d20832f 0002-RHEL5-Ignore-ERR_INVALID_STORAGE_POOL-when-checking-.patch
+cec7e1579f2edf8a3cc4f99e9ef4b3fb virt-v2v-0.4.10.tar.gz
Index: virt-v2v.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/EL-5/virt-v2v.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- virt-v2v.spec 9 Mar 2010 11:20:27 -0000 1.1
+++ virt-v2v.spec 14 Apr 2010 17:00:35 -0000 1.2
@@ -1,14 +1,21 @@
Name: virt-v2v
-Version: 0.4.0
+Version: 0.4.10
Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
Group: Applications/System
License: GPLv2+ and LGPLv2+
-URL: http://people.redhat.com/mbooth/virt-v2v/
-Source0: http://people.redhat.com/mbooth/virt-v2v/%{name}-%{version}.tar.gz
+URL: http://git.fedoraproject.org/git/virt-v2v.git
+Source0: https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildArch: noarch
+
+# Unfortunately, despite really being noarch, we have to make virt-v2v arch
+# dependent to avoid build failures on architectures where libguestfs isn't
+# available.
+ExclusiveArch: %{ix86} x86_64
+
+Patch0: 0001-RHEL5-Hardcode-the-location-of-qemu-kvm.patch
+Patch1: 0002-RHEL5-Ignore-ERR_INVALID_STORAGE_POOL-when-checking-.patch
# Build system direct requirements
BuildRequires: gettext
@@ -54,42 +61,22 @@ Requires: perl(XML::DOM::XPath)
Requires: perl(XML::Writer)
# Need an explicit package dependency for version requires
-Requires: perl-libguestfs >= 1:1.0.68
+Requires: perl-libguestfs >= 1:1.0.84
# For GuestOS transfer image
Requires: /usr/bin/mkisofs
-# For v2v-snapshot
-Requires: /usr/bin/qemu-img
-
-# The upstream French translation is broken, which breaks building in EL-5
-# This is a upstream commit 6a23d34232d673334055440cdc3cd7de4194eb04
-Patch0: virt-v2v-0.4.0-remove-fr.patch
-
-# The output of File::Temp->new cannot be passed to open3() on EL-5.
-# exechelper-tmpfile fixes this. exechelper-cleanup is a dependency of the fix.
-# These are upstream commits:
-# bcb0c5e05e7b51b2f31780cc5a663bf4359de95c
-Patch1: virt-v2v-0.4.0-exechelper-cleanup.patch
-# 0ea3bd7cdd15f221a31f4c225b96e9fe9377897f
-Patch2: virt-v2v-0.4.0-exechelper-tmpfile.patch
-
%description
virt-v2v is a tool for converting virtual machines to use the KVM hypervisor.
It modifies both the virtual machine image and its associated libvirt metadata.
virt-v2v will also configure a guest to use VirtIO drivers if possible.
-virt-v2v also includes the v2v-snapshot tool, which will modify a guest to use
-snapshot storage, and later commit the snapshot back to the original storage if
-desired.
-
%prep
%setup -q
+
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-
%build
%{__perl} Build.PL
@@ -106,8 +93,9 @@ rm -rf $RPM_BUILD_ROOT
%find_lang %{name}
-# Create v2v-snapshot directories
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-v2v/{snapshots,xml}
+# Create lib directory, used for holding software to be installed in guests
+mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-v2v
+
%check
./Build test
@@ -141,6 +129,20 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Wed Apr 14 2010 Matthew Booth <mbooth at redhat.com> - 0.4.10-1
+- Update to release 0.4.10
+- Update libguestfs version dependency to 1:1.0.84
+- Add patch to hardcode the location of qemu-kvm on RHEL 5
+- Add patch to ignore a buggy error return code in RHEL 5 libvirt
+- Make virt-v2v arch dependent to follow libguestfs
+
+* Thu Apr 1 2010 Matthew Booth <mbooth at redhat.com> - 0.4.9-1
+- Update to release 0.4.9
+- Remove all patches
+- Update description to reflect removal of v2v-snapshot
+- Remove qemu-img dependency for v2v-snapshot
+- Don't create snapshot and xml dirs in local state directory
+
* Mon Feb 22 2010 Matthew Booth <mbooth at redhat.com> - 0.4.0-1
- Update to release 0.4.0
- Change dependency on genisofs to mkisofs
More information about the scm-commits
mailing list