[virt-v2v/f16] - New upstream release 0.8.3. - Include upstream patch to fix whitespace problems in PO files. - Rem
Richard W.M. Jones
rjones at fedoraproject.org
Tue Aug 30 09:10:41 UTC 2011
commit 6dc0ccc894a119c45c622e7f27e7d836f7049c36
Author: Richard W.M. Jones <rjones at redhat.com>
Date: Mon Aug 22 14:38:16 2011 +0100
- New upstream release 0.8.3.
- Include upstream patch to fix whitespace problems in PO files.
- Remove virt-p2v from build by synchronizing the spec file so it
almost matches the one in RHEL 6.2. Note that virt-p2v is built in
a separate SRPM called rubygem-virt-p2v.
(cherry picked from commit c2522473e29af05d9d58a85be6ba83f9b96edcda)
.gitignore | 1 +
sources | 2 +-
virt-v2v-0.8.1-00-44eb9021-modified.patch | 9296 -----------------------------
virt-v2v-0.8.1-01-e34a8c09.patch | 57 -
virt-v2v-0.8.1-02-fadb1929.patch | 111 -
virt-v2v-0.8.1-03-a965f7e0.patch | 57 -
virt-v2v-0.8.1-04-77bd7908.patch | 29 -
virt-v2v-0.8.3-01-bd513aaf.patch | 67 +
virt-v2v.spec | 149 +-
9 files changed, 99 insertions(+), 9670 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index f89e54d..ecd4dd5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@
# Source
/virt-v2v-v0.8.1.tar.gz
+/virt-v2v-v0.8.3.tar.gz
diff --git a/sources b/sources
index d91078f..0c31efb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e850297f55ae839b28c8417d0acd080b virt-v2v-v0.8.1.tar.gz
+125315e4901b2dfae16590a746e35bfc virt-v2v-v0.8.3.tar.gz
diff --git a/virt-v2v-0.8.3-01-bd513aaf.patch b/virt-v2v-0.8.3-01-bd513aaf.patch
new file mode 100644
index 0000000..d8d4081
--- /dev/null
+++ b/virt-v2v-0.8.3-01-bd513aaf.patch
@@ -0,0 +1,67 @@
+From bd513aaf12a9cd27432eb36d341fd88f4d64dac4 Mon Sep 17 00:00:00 2001
+From: Matthew Booth <mbooth at redhat.com>
+Date: Fri, 19 Aug 2011 17:43:55 +0100
+Subject: [PATCH] Fix whitespace issues in translations
+
+---
+ po/es.po | 2 +-
+ po/nl.po | 2 +-
+ po/pl.po | 2 +-
+ po/uk.po | 2 +-
+ 4 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/po/es.po b/po/es.po
+index c24bf59..09fb7fe 100644
+--- a/po/es.po
++++ b/po/es.po
+@@ -1,7 +1,7 @@
+ # SOME DESCRIPTIVE TITLE.
+ # Copyright (C) YEAR Red Hat Inc.
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++#
+ # mdbooth <mbooth at redhat.com>, 2011.
+ # Héctor Daniel Cabrera <logan at fedoraproject.org>, 2011.
+ msgid ""
+diff --git a/po/nl.po b/po/nl.po
+index 3f88fa0..fe74413 100644
+--- a/po/nl.po
++++ b/po/nl.po
+@@ -1,7 +1,7 @@
+ # SOME DESCRIPTIVE TITLE.
+ # Copyright (C) YEAR Red Hat Inc.
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++#
+ # mdbooth <mbooth at redhat.com>, 2011.
+ # Geert Warrink <geert.warrink at onsnet.nu>, 2011.
+ msgid ""
+diff --git a/po/pl.po b/po/pl.po
+index 6465997..9508124 100644
+--- a/po/pl.po
++++ b/po/pl.po
+@@ -1,7 +1,7 @@
+ # SOME DESCRIPTIVE TITLE.
+ # Copyright (C) YEAR Red Hat Inc.
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++#
+ # mdbooth <mbooth at redhat.com>, 2011.
+ # Piotr Drąg <piotrdrag at gmail.com>, 2011.
+ msgid ""
+diff --git a/po/uk.po b/po/uk.po
+index 13172bd..21676bc 100644
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -1,7 +1,7 @@
+ # SOME DESCRIPTIVE TITLE.
+ # Copyright (C) YEAR Red Hat Inc.
+ # This file is distributed under the same license as the PACKAGE package.
+-#
++#
+ # mdbooth <mbooth at redhat.com>, 2011.
+ # Yuri Chornoivan <yurchor at ukr.net>, 2011.
+ msgid ""
+--
+1.7.6
+
diff --git a/virt-v2v.spec b/virt-v2v.spec
index 3bf9131..eeaeffe 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -1,6 +1,6 @@
Name: virt-v2v
-Version: 0.8.1
-Release: 4%{?dist}
+Version: 0.8.3
+Release: 1%{?dist}
Summary: Convert a virtual machine to run on KVM
Group: Applications/System
@@ -16,12 +16,7 @@ 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
-# Upstream patches to fix p2v client build in rawhide/f15
-Patch0: virt-v2v-0.8.1-00-44eb9021-modified.patch
-Patch1: virt-v2v-0.8.1-01-e34a8c09.patch
-Patch2: virt-v2v-0.8.1-02-fadb1929.patch
-Patch3: virt-v2v-0.8.1-03-a965f7e0.patch
-Patch4: virt-v2v-0.8.1-04-77bd7908.patch
+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
@@ -48,19 +43,19 @@ 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
-# virt-p2v build requirements
-BuildRequires: rubygem(rake)
-
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
# Need an explicit package dependency for version requires
@@ -72,6 +67,10 @@ Requires: perl-hivex >= 1.2.2
# 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
@@ -81,83 +80,32 @@ Requires: /usr/bin/mkisofs
# For guest image inspection
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
libvirt-managed KVM, or Red Hat Enterprise Virtualization. It can import a
variety of guest operating systems from libvirt-managed hosts and VMware ESX.
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname virt-p2v
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
-%global rubyabi 1.8
-
-%package -n rubygem-%{gemname}
-Summary: Send a machine's storage and metadata to virt-p2v-server
-BuildArch: noarch
-Requires: ruby(abi) = %{rubyabi}
-Requires: rubygem(gtk2)
-Requires: rubygem(gettext)
-Requires: rubygem(net-ssh)
-Requires: ruby(dbus)
-
-Requires: /sbin/blockdev
-Requires: /usr/bin/hwloc-info
-Requires: NetworkManager
-
-Provides: rubygem(%{gemname}) = %{version}
-
-%description -n rubygem-%{gemname}
-virt-p2v is a client which connects to a virt-p2v-server and transfer's the host
-machine's storage and metadata. virt-p2v is intended to be run from a live
-image, so it is unlikely you want to install it directly.
-
-%package -n rubygem-%{gemname}-doc
-Summary: Documentation for rubygem-%{gemname}
-Group: Documentation
-BuildArch: noarch
-Requires: rubygem-%{gemname} = %{version}-%{release}
-
-%description -n rubygem-%{gemname}-doc
-Documentation for rubygem-%{gemname}
-
-%package -n virt-p2v-image-builder
-Summary: Create a virt-p2v bootable image
-BuildArch: noarch
-
-# image builder script requires
-Requires: /usr/bin/ksflatten
-Requires: /usr/sbin/setenforce
-Requires: /usr/bin/livecd-creator
-
-# Kickstart nochroot scripts requires
-Requires: /usr/bin/livecd-iso-to-disk
-Requires: /usr/bin/livecd-iso-to-pxeboot
-Requires: /usr/bin/image-minimizer
-
-%description -n virt-p2v-image-builder
-virt-p2v-image-builder is a tool to create a bootable virt-p2v live image.
%prep
%setup -q -n %{name}-v%{version}
-%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%{__perl} Build.PL
./Build
-pushd p2v/client
-rake gem
-popd
-
-# Neither perl nor ruby need debuginfo
+# perl doesn't need debuginfo
%define debug_package %{nil}
+
%install
rm -rf %{buildroot}
./Build install \
@@ -172,42 +120,19 @@ mkdir -p $statedir/software
mkdir -p %{buildroot}%{_sysconfdir}
cp v2v/virt-v2v.conf %{buildroot}%{_sysconfdir}/
+cp v2v/virt-v2v.db $statedir/
%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.
-find %{buildroot}/%{perl_archlib} -name .packlist -type f | xargs rm
-
-# Install p2v-client
-mkdir -p %{buildroot}/%{_bindir}
-mkdir -p %{buildroot}/%{gemdir}
-
-gem install --local --install-dir %{buildroot}%{gemdir} \
- --force --rdoc p2v/client/pkg/%{gemname}-%{version}.gem
-mv %{buildroot}%{gemdir}/bin/* %{buildroot}/%{_bindir}
-find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
-cp COPYING %{buildroot}/%{geminstdir}
-
-# Install p2v-image-builder
-%global builderdir %{_datadir}/virt-p2v-image-builder
-builder=%{buildroot}/%{_bindir}/virt-p2v-image-builder
-mkdir -p %{buildroot}%{builderdir}
-cp p2v/image-builder/*.ks %{buildroot}%{builderdir}
-cp p2v/image-builder/virt-p2v-image-builder $builder
-
-# Set the default data directory
-sed -i -e 's,^DEFAULT_DATADIR=.*,DEFAULT_DATADIR=%{builderdir},' $builder
+[ -d "%{buildroot}/%{perl_archlib}" ] &&
+ find %{buildroot}/%{perl_archlib} -name .packlist -type f | xargs rm
%check
./Build test
-pushd p2v/client
-# No tests yet
-#rake test
-popd
-
%clean
rm -rf %{buildroot}
@@ -236,32 +161,18 @@ rm -rf %{buildroot}
%dir %{_localstatedir}/lib/virt-v2v
%config(noreplace) %{_sysconfdir}/virt-v2v.conf
+%config %{_localstatedir}/lib/virt-v2v/virt-v2v.db
%config(noreplace) %{_localstatedir}/lib/virt-v2v/software
-%files -n rubygem-%{gemname}
-%defattr(-, root, root, -)
-%{_bindir}/virt-p2v
-%dir %{geminstdir}
-%{geminstdir}/bin
-%{geminstdir}/lib
-%doc %{geminstdir}/COPYING
-%doc %{geminstdir}/Manifest
-%doc %{geminstdir}/Rakefile
-%doc %{geminstdir}/%{gemname}.gemspec
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
-
-%files -n rubygem-%{gemname}-doc
-%defattr(-, root, root, -)
-%{gemdir}/doc/%{gemname}-%{version}
-
-%files -n virt-p2v-image-builder
-%defattr(-, root, root, -)
-%{_bindir}/virt-p2v-image-builder
-%{builderdir}
-
%changelog
+* 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.
+- Remove virt-p2v from build by synchronizing the spec file so it
+ almost matches the one in RHEL 6.2. Note that virt-p2v is built in
+ a separate SRPM called rubygem-virt-p2v.
+
* Thu Jul 21 2011 Petr Sabata <contyk at redhat.com> - 0.8.1-4
- Perl mass rebuild
More information about the scm-commits
mailing list