rpms/kernel/F-13 kernel.spec,1.1947,1.1948

[Chuck Ebbert]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9147

Modified Files:
	kernel.spec 
Log Message:
Add examples.txt to perf docs, require libdwarf with perf package.
  (#568309, #569506)


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.1947
retrieving revision 1.1948
diff -u -p -r1.1947 -r1.1948
--- kernel.spec	15 Mar 2010 13:32:08 -0000	1.1947
+++ kernel.spec	16 Mar 2010 09:29:06 -0000	1.1948
@@ -472,9 +472,6 @@ Requires(pre): kernel-firmware >= %{rpmv
 %else\
 Requires(pre): linux-firmware\
 %endif\
-%if %{with_perftool}\
-Requires(pre): libdwarf\
-%endif\
 Requires(post): /sbin/new-kernel-pkg\
 Requires(preun): /sbin/new-kernel-pkg\
 Conflicts: %{kernel_dot_org_conflicts}\
@@ -803,9 +800,10 @@ It provides the kernel source files comm
 Summary: Performance monitoring for the Linux kernel
 Group: Development/System
 License: GPLv2
+Requires: libdwarf
 %description -n perf
-This package provides the supporting documentation for the perf tool
-shipped in each kernel image subpackage.
+This package provides the perf shell script, supporting documentation and
+required libraries for the perf tool shipped in each kernel image subpackage.
 
 #
 # This macro creates a kernel-<subpackage>-debuginfo package.
@@ -1717,8 +1715,8 @@ xargs -0 --no-run-if-empty %{__install} 
 ls $man9dir | grep -q '' || > $man9dir/BROKEN
 %endif # with_doc
 
-# perf docs
 %if %{with_perf}
+# perf docs
 mandir=$RPM_BUILD_ROOT%{_datadir}/man
 man1dir=$mandir/man1
 pushd tools/perf/Documentation
@@ -1730,15 +1728,14 @@ for d in *.1; do
  gzip $d;
 done
 popd
-%endif # with_perf
 
-# perf shell wrapper
-%if %{with_perf}
+# perf shell wrapper and examples
 mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 cp $RPM_SOURCE_DIR/perf $RPM_BUILD_ROOT/usr/sbin/perf
 chmod 0755 $RPM_BUILD_ROOT/usr/sbin/perf
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/doc/perf
-%endif
+cp tools/perf/Documentation/examples.txt $RPM_BUILD_ROOT%{_datadir}/doc/perf
+%endif # with_perf
 
 %if %{with_headers}
 # Install kernel headers
@@ -1993,6 +1990,10 @@ fi
 # and build.
 
 %changelog
+* Tue Mar 16 2010 Chuck Ebbert <cebbert at redhat.com>
+- Add examples.txt to perf docs, require libdwarf with perf package.
+  (#568309, #569506)
+
 * Mon Mar 15 2010 Chuck Ebbert <cebbert at redhat.com>
 - Linux 2.6.33.1-rc1
 - Drop merged patch: