rpms/kernel/devel kernel.spec,1.1825,1.1826

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24706

Modified Files:
	kernel.spec 
Log Message:
* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
- Always build perf docs, regardless of whether we build kernel-doc.
  Seems rather unfair to not ship the manpages half the time.
  Also, drop BuildRequires %if when not with_doc, the rules about %if
  there are f*!&^ing complicated.



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1825
retrieving revision 1.1826
diff -u -p -r1.1825 -r1.1826
--- kernel.spec	13 Oct 2009 02:25:30 -0000	1.1825
+++ kernel.spec	13 Oct 2009 03:13:16 -0000	1.1826
@@ -491,12 +491,7 @@ BuildRequires: module-init-tools, patch 
 BuildRequires: bzip2, findutils, gzip, m4, perl, make >= 3.78, diffutils, gawk
 BuildRequires: gcc >= 3.4.2, binutils >= 2.12, redhat-rpm-config
 BuildRequires: net-tools
-%if %{with_doc}
-BuildRequires: xmlto
-%if %{with_perf}
-BuildRequires: asciidoc
-%endif
-%endif
+BuildRequires: xmlto, asciidoc
 %if %{with_sparse}
 BuildRequires: sparse >= 0.4.1
 %endif
@@ -1637,17 +1632,16 @@ BuildKernel vmlinux vmlinux kdump vmlinu
 # Make the HTML and man pages.
 make %{?_smp_mflags} htmldocs mandocs || %{doc_build_fail}
 
-%if %{with_perf}
-pushd tools/perf
-make %{?_smp_mflags} man || %{doc_build_fail}
-popd
-%endif
-
 # sometimes non-world-readable files sneak into the kernel source tree
 chmod -R a=rX Documentation
 find Documentation -type d | xargs chmod u+w
 %endif
 
+%if %{with_perf}
+pushd tools/perf
+make %{?_smp_mflags} man || %{doc_build_fail}
+popd
+%endif
 
 ###
 ### Special hacks for debuginfo subpackages.
@@ -1691,6 +1685,7 @@ mkdir -p $man9dir
 find Documentation/DocBook/man -name '*.9.gz' -print0 |
 xargs -0 --no-run-if-empty %{__install} -m 444 -t $man9dir $m
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
+%endif # with_doc
 
 # perf docs
 %if %{with_perf}
@@ -1705,9 +1700,7 @@ for d in *.1; do
  gzip $d;
 done
 popd
-
-%endif
-%endif
+%endif # with_perf
 
 # perf shell wrapper
 %if %{with_perf}
@@ -1891,10 +1884,8 @@ fi
 %defattr(-,root,root)
 %{_datadir}/doc/perf
 /usr/sbin/perf
-%if %{with_doc}
 %{_datadir}/man/man1/*
 %endif
-%endif
 
 # This is %{image_install_path} on an arch where that includes ELF files,
 # or empty otherwise.
@@ -1979,6 +1970,12 @@ fi
 
 %changelog
 * Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
+- Always build perf docs, regardless of whether we build kernel-doc.
+  Seems rather unfair to not ship the manpages half the time.
+  Also, drop BuildRequires %if when not with_doc, the rules about %if
+  there are f*!&^ing complicated.
+
+* Tue Oct 13 2009 Kyle McMartin <kyle at redhat.com>
 - Build perf manpages properly.
 
 * Tue Oct 13 2009 Dave Airlie <airlied at redhat.com>