2008-02-27 David Smith <dsmith@redhat.com>

        PR5729
        * systemtap.spec.in: Adds examples to the testsuite rpm so that
        systemtap.samples/examples.exp works correctly.

diff --git a/ChangeLog b/ChangeLog
index cf56313cf40c1eb555aef104d404d133d2324e35..3c183d734cfa167848bbb489340d63049cb63a13 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-27  David Smith  <dsmith@redhat.com>
+
+       PR5729
+       * systemtap.spec.in: Adds examples to the testsuite rpm so that
+       systemtap.samples/examples.exp works correctly.
+
 2008-02-26  Dave Brolley  <brolley@redhat.com>
 
        PR5018

diff --git a/systemtap.spec.in b/systemtap.spec.in
index 789f219f42c473976e8cc1beca45f40fd0a352b5..7d0579f24fd999df6576952046393fb4a0885f39 100644 (file)
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -145,6 +145,8 @@ chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun
 
 # Copy over the testsuite
 cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
+mkdir $RPM_BUILD_ROOT%{_datadir}/%{name}/src
+cp -rp examples $RPM_BUILD_ROOT%{_datadir}/%{name}/src
 
 %clean
 rm -rf ${RPM_BUILD_ROOT}
@@ -163,9 +165,9 @@ exit 0
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
-%dir %{_datadir}/systemtap
-%{_datadir}/systemtap/runtime
-%{_datadir}/systemtap/tapset
+%dir %{_datadir}/%{name}
+%{_datadir}/%{name}/runtime
+%{_datadir}/%{name}/tapset
 
 %if %{with_bundled_elfutils} || %{with_crash}
 %dir %{_libdir}/%{name}
@@ -180,14 +182,15 @@ exit 0
 %files runtime
 %defattr(-,root,root)
 %attr(4111,root,root) %{_bindir}/staprun
-%{_libexecdir}/systemtap
+%{_libexecdir}/%{name}
 %{_mandir}/man8/*
 
 %doc README AUTHORS NEWS COPYING
 
 %files testsuite
 %defattr(-,root,root)
-%{_datadir}/systemtap/testsuite
+%{_datadir}/%{name}/src
+%{_datadir}/%{name}/testsuite
 
 
 %changelog