Build rdoc with explicit options

This commit is contained in:
Matthew Booth 2011-05-12 10:10:32 +01:00
parent 55697cb1eb
commit 2f01f5c174
2 changed files with 60 additions and 1 deletions

View File

@ -0,0 +1,57 @@
commit a965f7e0609acc6107ffbbf70054776ee3c81918
Author: Matthew Booth <mbooth@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

View File

@ -16,9 +16,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# local seq no: the order the patches should be applied in # local seq no: the order the patches should be applied in
# git commit: the first 8 characters of the git commit hash # 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 Patch0: virt-v2v-0.8.1-00-44eb9021-modified.patch
Patch1: virt-v2v-0.8.1-01-e34a8c09.patch Patch1: virt-v2v-0.8.1-01-e34a8c09.patch
Patch2: virt-v2v-0.8.1-02-fadb1929.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 # Unfortunately, despite really being noarch, we have to make virt-v2v arch
# dependent to avoid build failures on architectures where libguestfs isn't # 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 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
%{__perl} Build.PL %{__perl} Build.PL