2007-08-15 David Smith <dsmith@redhat.com>

	* systemtap.spec.in: Updated %pre to latest Fedora group creation
	guidelines.

	* stap.1.in: Changed '/usr' to '@prefix@' so the values will be
	updated correctly.
	* stapfunc.5.in: Ditto.

4 files changed, 12 insertions, 12 deletions

diff --git a/README.security b/README.security
index b53499f7..62728068 100644
--- a/README.security
+++ b/README.security
@@ -10,7 +10,7 @@ but required all systemtap users to have root access.  Many sysadmins
 on enterprise systems do not have root access.
 
 So, a new security model was developed.  To run the staprun program
-(which install systemtap kernel modules), a user must be one of the
+(which installs systemtap kernel modules), a user must be one of the
 following:
 
  * the root user;
diff --git a/stap.1.in b/stap.1.in
index 85ff8266..75a408f1 100644
--- a/stap.1.in
+++ b/stap.1.in
@@ -660,7 +660,7 @@ functions in order to write compatible embedded-C ones.
 A set of builtin functions and probe point aliases are provided
 by the scripts installed under the
 .nh
-.IR /usr/share/systemtap/tapset
+.IR @prefix@/share/systemtap/tapset
 .hy
 directory.  These are described in the
 .IR stapfuncs "(5) and " stapprobes (5)
@@ -892,13 +892,13 @@ environment variable.
 Temporary directory for systemtap files, including translated C code
 and kernel object.
 .TP
-/usr/share/systemtap/tapset 
+@prefix@/share/systemtap/tapset 
 The automatic tapset search directory, unless overridden by
 the
 .I SYSTEMTAP_TAPSET
 environment variable.
 .TP
-/usr/share/systemtap/runtime
+@prefix@/share/systemtap/runtime
 The runtime sources, unless overridden by the
 .I SYSTEMTAP_RUNTIME
 environment variable.
@@ -906,12 +906,12 @@ environment variable.
 /lib/modules/VERSION/build
 The location of kernel module building infrastructure.
 .TP
-/usr/lib/debug/lib/modules/VERSION
+@prefix@/lib/debug/lib/modules/VERSION
 The location of kernel debugging information when packaged into the
 .IR kernel\-debuginfo
 RPM.
 .TP
-/usr/bin/staprun
+@prefix@/bin/staprun
 The auxiliary program supervising module loading, interaction, and
 unloading.
 
diff --git a/stapfuncs.5.in b/stapfuncs.5.in
index af4cbd15..0a35b543 100644
--- a/stapfuncs.5.in
+++ b/stapfuncs.5.in
@@ -5,7 +5,7 @@ stapfuncs \- systemtap functions
 
 .SH DESCRIPTION
 The following sections enumerate the public functions provided by
-standard tapsets installed under /usr/share/systemtap/tapset.  Each
+standard tapsets installed under @prefix@/share/systemtap/tapset.  Each
 function is described with a signature, and its behavior/restrictions.
 The signature line includes the name of the function, the type of
 its return value (if any), and the names and types of all parameters.
@@ -345,7 +345,7 @@ Returns the string representation of the given message flags bit map.
 
 .SH FILES
 .nh
-.IR /usr/share/systemtap/tapset
+.IR @prefix@/share/systemtap/tapset
 .hy
 
 .SH SEE ALSO
diff --git a/systemtap.spec.in b/systemtap.spec.in
index ead918ec..2f927a30 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -60,6 +60,7 @@ Requires: glib2 >= 2.0.0
 Requires: gcc make
 # Suggest: kernel-debuginfo
 Requires: systemtap-runtime = %{version}-%{release}
+Requires(pre): shadow-utils
 
 %if %{bundled_elfutils}
 Source1: elfutils-%{elfutils_version}.tar.gz
@@ -147,10 +148,9 @@ make check %{?elfutils_mflags} || :
 rm -rf ${RPM_BUILD_ROOT}
 
 %pre
-if [ $1 -eq 1 ]; then
-    groupadd -r stapdev >/dev/null 2>&1 || :
-    groupadd -r stapusr >/dev/null 2>&1 || :
-fi
+getent group stapdev >/dev/null || groupadd -r stapdev
+getent group stapusr >/dev/null || groupadd -r stapusr
+exit 0
 
 %files
 %defattr(-,root,root)