rpms/virt-v2v/F-13 sources,1.4,1.5 virt-v2v.spec,1.4,1.5

[Matthew Booth]

Author: mdbooth

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

Modified Files:
	sources virt-v2v.spec 
Log Message:
Update to release 0.6.1



Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-13/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources	9 Nov 2009 17:20:06 -0000	1.4
+++ sources	21 Jun 2010 14:47:40 -0000	1.5
@@ -1 +1 @@
-97549757c80ad03422f3e4d1c84be882  virt-v2v-0.3.2.tar.gz
+8b9cc7d3d92cc4b69e973a9e686425df  virt-v2v-v0.6.1.tar.gz


Index: virt-v2v.spec
===================================================================
RCS file: /cvs/pkgs/rpms/virt-v2v/F-13/virt-v2v.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- virt-v2v.spec	7 Dec 2009 00:39:33 -0000	1.4
+++ virt-v2v.spec	21 Jun 2010 14:47:41 -0000	1.5
@@ -1,18 +1,17 @@
 Name:           virt-v2v
-Version:        0.3.2
-Release:        2%{?dist}
+Version:        0.6.1
+Release:        0%{?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}-v%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildArch:      noarch
-
 # Build system direct requirements
 BuildRequires:  gettext
+BuildRequires:  perl
 BuildRequires:  perl(Module::Build)
 BuildRequires:  perl(ExtUtils::Manifest)
 BuildRequires:  perl(Test::More)
@@ -21,60 +20,54 @@ BuildRequires:  perl(Test::Pod::Coverage
 BuildRequires:  perl(Module::Find)
 
 # Runtime perl modules also required at build time for use_ok test
-BuildRequires:  perl(Config::Tiny)
+BuildRequires:  perl(IO::String)
 BuildRequires:  perl(Locale::TextDomain)
+BuildRequires:  perl(LWP::UserAgent)
 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(URI)
 BuildRequires:  perl(XML::DOM)
 BuildRequires:  perl(XML::DOM::XPath)
 BuildRequires:  perl(XML::Writer)
 
 # Need an explicit package dependency for version requires
-BuildRequires:  perl-libguestfs >= 1:1.0.68
+BuildRequires:  perl-libguestfs >= 1:1.2.7-1.el5.3
+BuildRequires:  perl-hivex >= 1.2.2
 
 Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 
-# Perl module requirements
-Requires:       perl(Config::Tiny)
-Requires:       perl(Locale::TextDomain)
-Requires:       perl(Module::Pluggable)
-Requires:       perl(Sys::Guestfs)
-Requires:       perl(Sys::Guestfs::Lib)
-Requires:       perl(Sys::Virt)
-Requires:       perl(XML::DOM)
-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.2.7-1.el5.3
+Requires:       perl-hivex >= 1.2.2
 
-# For GuestOS transfer image
-Requires:       /usr/bin/genisoimage
+# Net::SSL is loaded dynamically by Net::HTTPS in Sys::VirtV2V::Transfer::ESX.
+# The dependency isn't automatically discovered.
+Requires:       perl(Net::SSL)
 
-# For v2v-snapshot
-Requires:       /usr/bin/qemu-img
+# Need >= 0.8.1 for rpc fix talking to RHEL 5 libvirt
+Requires:       libvirt >= 0.8.1
 
+# For GuestOS transfer image
+Requires:       /usr/bin/mkisofs
 
 %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.
+virt-v2v is a tool for converting and importing virtual machines to
+libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a
+variety of guest operating systems from libvirt-managed hosts and VMware ESX.
 
 
 %prep
-%setup -q
-
+%setup -q -n %{name}-v%{version}
 
 %build
 %{__perl} Build.PL
 ./Build
 
+# Perl doesn't need debuginfo
+%define debug_package %{nil}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -84,10 +77,15 @@ rm -rf $RPM_BUILD_ROOT
     --install_path locale=%{_datadir}/locale \
     --install_path confdoc=%{_mandir}/man5
 
+# Create lib directory, used for holding software to be installed in guests
+statedir=$RPM_BUILD_ROOT%{_localstatedir}/lib/virt-v2v
+mkdir -p $statedir/software
+
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}
+cp v2v/virt-v2v.conf $RPM_BUILD_ROOT%{_sysconfdir}/
+
 %find_lang %{name}
 
-# Create v2v-snapshot directories
-mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/virt-v2v/{snapshots,xml}
 
 %check
 ./Build test
@@ -100,11 +98,10 @@ rm -rf $RPM_BUILD_ROOT
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 
-%doc TODO
+%doc TODO.txt
 %doc META.yml
 %doc ChangeLog
 %doc COPYING COPYING.LIB
-%doc v2v/virt-v2v.conf
 
 # For noarch packages: vendorlib
 %{perl_vendorlib}/*
@@ -117,10 +114,28 @@ rm -rf $RPM_BUILD_ROOT
 # Executables
 %attr(0755,root,root) %{_bindir}/*
 
-%{_localstatedir}/lib/virt-v2v
+%dir %{_localstatedir}/lib/virt-v2v
+
+%config(noreplace) %{_sysconfdir}/virt-v2v.conf
+%config(noreplace) %{_localstatedir}/lib/virt-v2v/software
 
 
 %changelog
+* Mon Jun 21 2010 Matthew Booth <mbooth at redhat.com> - 0.6.1
+- Update to release 0.6.1
+- Disable building of debuginfo
+
+* 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
+- Update libguestfs dependency to 1.0.84
+- Add perl module dependencies: LWP::UserAgent, Net::HTTPS, Net::SSL, Net::URI
+- Remove perl module dependency: Config::Tiny
+- Add explicit build dependency on perl
+- Add patch: virt-v2v-0.4.0-remove-fr.patch
+- Add patch: virt-v2v-0.4.0-exechelper-cleanup.patch
+- Add patch: virt-v2v-0.4.0-exechelper-tmpfile.patch
+
 * Mon Dec  7 2009 Stepan Kasal <skasal at redhat.com> - 0.3.2-2
 - rebuild against perl 5.10.1