From c256c4a6d2c9d9039924ef5fcdcbf4e802ed19c9 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Thu, 7 Aug 2008 16:42:16 +0200
Subject: Add comment about versioned vs unversioned docs to systemtap.spec.

---
 systemtap.spec | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'systemtap.spec')

diff --git a/systemtap.spec b/systemtap.spec
index 503022d1..e5bd22f5 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -135,7 +135,10 @@ make %{?_smp_mflags}
 rm -rf ${RPM_BUILD_ROOT}
 make DESTDIR=$RPM_BUILD_ROOT install
 
-# We want the examples in the special doc dir, not the generoc doc install dir.
+# We want the examples in the special doc dir, not the build install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
 mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
 
 # Fix paths in the example & testsuite scripts
@@ -155,6 +158,9 @@ cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
 
 #%if %{with_docs}
 # We want the manuals in the special doc dir, not the generic doc install dir.
+# We build it in place and then move it away so it doesn't get installed
+# twice. rpm can specify itself where the (versioned) docs go with the
+# %doc directive.
 mkdir docs.installed
 mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/*.pdf docs.installed/
 #%endif
-- 
cgit 


From 164567d1f0c89310228e913c38a51c08e890f947 Mon Sep 17 00:00:00 2001
From: Mark Wielaard <mwielaard@redhat.com>
Date: Fri, 8 Aug 2008 15:25:33 +0200
Subject: Disable chmodding of samples/kmalloc-top in spec file since it isn't
 installed.

---
 systemtap.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'systemtap.spec')

diff --git a/systemtap.spec b/systemtap.spec
index e5bd22f5..6e6754c4 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -145,7 +145,7 @@ mv $RPM_BUILD_ROOT%{_datadir}/doc/systemtap/examples examples
 find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
 
 # To avoid perl dependency, make perl sample script non-executable
-chmod -x examples/samples/kmalloc-top
+#chmod -x examples/samples/kmalloc-top
 
 # Because "make install" may install staprun with mode 04111, the
 # post-processing programs rpmbuild runs won't be able to read it.
-- 
cgit 


From d5658775da9fa0ac792eb3f874df9f7c4d60de7e Mon Sep 17 00:00:00 2001
From: Dave Brolley <brolley@redhat.com>
Date: Fri, 8 Aug 2008 15:11:36 -0400
Subject: Start/stop the systemtap server from systemtap.exp and not in the top
 level Makefile.

---
 systemtap.spec | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'systemtap.spec')

diff --git a/systemtap.spec b/systemtap.spec
index 503022d1..61ccd667 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -46,6 +46,7 @@ Requires: crash
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 %endif
+Requires: avahi-tools nc
 
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
@@ -59,6 +60,7 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: kernel >= 2.6.9-11
 Requires(pre): shadow-utils
+Requires: avahi-tools nc
 
 %description runtime
 SystemTap runtime is the runtime component of an instrumentation
@@ -178,10 +180,6 @@ exit 0
 %{_bindir}/stap
 %{_bindir}/stap-server
 %{_bindir}/stap-serverd
-%{_bindir}/stap-find-servers
-%{_bindir}/stap-start-server
-%{_bindir}/stap-find-or-start-server
-%{_bindir}/stap-stop-server
 %{_mandir}/man1/*
 %{_mandir}/man5/*
 
@@ -203,6 +201,10 @@ exit 0
 %defattr(-,root,root)
 %attr(4111,root,root) %{_bindir}/staprun
 %{_bindir}/stap-client
+%{_bindir}/stap-find-servers
+%{_bindir}/stap-start-server
+%{_bindir}/stap-find-or-start-server
+%{_bindir}/stap-stop-server
 %{_libexecdir}/%{name}
 %{_mandir}/man8/*
 
-- 
cgit