[virt-v2v/f14] Build rdoc with explicit options
Matthew Booth
mdbooth at fedoraproject.org
Tue May 17 09:20:35 UTC 2011
commit 736b7650209468eeb8295d540428805df8b7776e
Author: Matthew Booth <mbooth at redhat.com>
Date: Thu May 12 10:10:32 2011 +0100
Build rdoc with explicit options
virt-v2v-0.8.1-03-a965f7e0.patch | 57 ++++++++++++++++++++++++++++++++++++++
virt-v2v.spec | 4 ++-
2 files changed, 60 insertions(+), 1 deletions(-)
---
diff --git a/virt-v2v-0.8.1-03-a965f7e0.patch b/virt-v2v-0.8.1-03-a965f7e0.patch
new file mode 100644
index 0000000..2dc1eed
--- /dev/null
+++ b/virt-v2v-0.8.1-03-a965f7e0.patch
@@ -0,0 +1,57 @@
+commit a965f7e0609acc6107ffbbf70054776ee3c81918
+Author: Matthew Booth <mbooth at redhat.com>
+Date: Thu May 12 10:07:06 2011 +0100
+
+ p2v-client: Build rdoc with options
+
+ Use rdoc options taken from gemspec generated by echoe.
+
+diff --git a/p2v/client/virt-p2v.gemspec b/p2v/client/virt-p2v.gemspec
+index d8edde8..610c2a3 100644
+--- a/p2v/client/virt-p2v.gemspec
++++ b/p2v/client/virt-p2v.gemspec
+@@ -72,25 +72,23 @@ GEMSPEC = Gem::Specification.new do |s|
+ s.add_dependency(%q<net-ssh>, [">= 0"])
+ end
+
+-# Source doesn't contain any rdoc
+-# s.extra_rdoc_files = [
+-# "bin/virt-p2v",
+-# "lib/virt-p2v/blockdevice.rb",
+-# "lib/virt-p2v/connection.rb",
+-# "lib/virt-p2v/converter.rb",
+-# "lib/virt-p2v/gtk-queue.rb",
+-# "lib/virt-p2v/netdevice.rb",
+-# "lib/virt-p2v/ui/connect.rb",
+-# "lib/virt-p2v/ui/convert.rb",
+-# "lib/virt-p2v/ui/main.rb",
+-# "lib/virt-p2v/ui/network.rb",
+-# "lib/virt-p2v/ui/p2v.ui",
+-# "lib/virt-p2v/ui/success.rb"
+-# ]
+-# s.rdoc_options = [
+-# "--line-numbers",
+-# "--inline-source",
+-# "--title",
+-# "Virt-p2v"
+-# ]
++ s.extra_rdoc_files = [
++ "bin/virt-p2v",
++ "lib/virt-p2v/blockdevice.rb",
++ "lib/virt-p2v/connection.rb",
++ "lib/virt-p2v/converter.rb",
++ "lib/virt-p2v/gtk-queue.rb",
++ "lib/virt-p2v/netdevice.rb",
++ "lib/virt-p2v/ui/connect.rb",
++ "lib/virt-p2v/ui/convert.rb",
++ "lib/virt-p2v/ui/main.rb",
++ "lib/virt-p2v/ui/network.rb",
++ "lib/virt-p2v/ui/p2v.ui",
++ "lib/virt-p2v/ui/success.rb"
++ ]
++ s.rdoc_options = [
++ "--line-numbers",
++ "--inline-source",
++ "--title", "virt-p2v"
++ ]
+ end
diff --git a/virt-v2v.spec b/virt-v2v.spec
index c0e850f..fcb5ba2 100644
--- a/virt-v2v.spec
+++ b/virt-v2v.spec
@@ -16,9 +16,11 @@ 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
# Unfortunately, despite really being noarch, we have to make virt-v2v arch
# dependent to avoid build failures on architectures where libguestfs isn't
@@ -141,7 +143,7 @@ virt-p2v-image-builder is a tool to create a bootable virt-p2v live image.
%patch0 -p1
%patch1 -p1
%patch2 -p1
-
+%patch3 -p1
%build
%{__perl} Build.PL
More information about the scm-commits
mailing list