rpms/virt-v2v/F-13 virt-v2v.spec,1.5,1.6

[Matthew Booth]

Author: mdbooth

Update of /cvs/pkgs/rpms/virt-v2v/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv29207

Modified Files:
	virt-v2v.spec 
Log Message:
Build fixes from rawhide



Index: virt-v2v.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-13/virt-v2v.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- virt-v2v.spec	21 Jun 2010 14:47:41 -0000	1.5
+++ virt-v2v.spec	2 Jul 2010 15:41:14 -0000	1.6
@@ -1,6 +1,6 @@
 Name:           virt-v2v
 Version:        0.6.1
-Release:        0%{?dist}
+Release:        1%{?dist}
 Summary:        Convert a virtual machine to run on KVM
 
 Group:          Applications/System
@@ -9,6 +9,11 @@ URL:            http://git.fedoraproject
 Source0:        https://fedorahosted.org/releases/v/i/virt-v2v/%{name}-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+# 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
+
 # Build system direct requirements
 BuildRequires:  gettext
 BuildRequires:  perl
@@ -28,6 +33,7 @@ BuildRequires:  perl(Net::HTTPS)
 BuildRequires:  perl(Net::SSL)
 BuildRequires:  perl(Sys::Guestfs)
 BuildRequires:  perl(Sys::Guestfs::Lib)
+BuildRequires:  perl(Sys::Virt)
 BuildRequires:  perl(URI)
 BuildRequires:  perl(XML::DOM)
 BuildRequires:  perl(XML::DOM::XPath)
@@ -86,6 +92,10 @@ cp v2v/virt-v2v.conf $RPM_BUILD_ROOT%{_s
 
 %find_lang %{name}
 
+# Not clear why this is being created as there is nothing arch-specific in
+# virt-v2v. It isn't packaged, though, so we need to delete it.
+rm -f $RPM_BUILD_ROOT/%{perl_archlib}/auto/Sys/VirtV2V/.packlist
+
 
 %check
 ./Build test
@@ -121,7 +131,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Jun 21 2010 Matthew Booth <mbooth at redhat.com> - 0.6.1
+* Thu Jul  1 2010 Matthew Booth <mbooth at redhat.com> - 0.6.1-1
+- Only build virt-v2v on architectures where libguestfs is available
+
+* Mon Jun 21 2010 Matthew Booth <mbooth at redhat.com> - 0.6.1-0
 - Update to release 0.6.1
 - Disable building of debuginfo