From dedfb0242424555ee4309df0c0623a7f7ca84ab5 Mon Sep 17 00:00:00 2001
From: fche <fche>
Date: Tue, 27 Feb 2007 23:05:53 +0000
Subject: 2007-02-27  Frank Ch. Eigler  <fche@elastic.org>

	* systemtap.spec.in (/var/cache/systemtap): Forget it.
	(stp_check): Pack this in with systemtap-runtime.
	* stp_check.in: Add LANG=C for speed.
---
 ChangeLog         | 6 ++++++
 stp_check.in      | 4 ++++
 systemtap.spec.in | 7 +------
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3ef353d..2190bee4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-27  Frank Ch. Eigler  <fche@elastic.org>
+
+	* systemtap.spec.in (/var/cache/systemtap): Forget it.
+	(stp_check): Pack this in with systemtap-runtime.
+	* stp_check.in: Add LANG=C for speed.
+
 2007-02-27  David Smith  <dsmith@redhat.com>
 
 	* staprun.8.in: Added a basic staprun man page.
diff --git a/stp_check.in b/stp_check.in
index 66a47feb..3f7fe0a8 100755
--- a/stp_check.in
+++ b/stp_check.in
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# speed up grep and friends
+LANG=C
+export LANG
+
 RELAYFS_FS=`grep relayfs_create_dir /proc/kallsyms`
 RELAY=`grep relay_open /proc/kallsyms`
 if [ -n "$RELAY" -a -z "$RELAYFS_FS" ]
diff --git a/systemtap.spec.in b/systemtap.spec.in
index 038a7c06..0faa8dd4 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -110,11 +110,8 @@ find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+sta
 
 %install
 rm -rf ${RPM_BUILD_ROOT}
-
 make DESTDIR=$RPM_BUILD_ROOT install
 
-mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
-
 %check
 make check %{?elfutils_mflags} || :
 
@@ -130,14 +127,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/lket-b2a
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{_libexecdir}/systemtap
 
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
 %{_datadir}/systemtap/tapset
 
-%dir %attr(0755,root,root) /var/cache/systemtap
-
 %if %{bundled_elfutils}
 %dir %{_libdir}/%{name}
 %{_libdir}/%{name}/lib*.so*
@@ -146,6 +140,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %files runtime
 %defattr(-,root,root)
 %{_bindir}/staprun
+%{_libexecdir}/stp_check
 %{_mandir}/man8/*
 
 %doc README AUTHORS NEWS COPYING
-- 
cgit