From 37b99e783ae310a71a612506750054b2e2c13073 Mon Sep 17 00:00:00 2001
From: dsmith <dsmith>
Date: Tue, 27 Feb 2007 18:25:04 +0000
Subject: 2007-02-27  David Smith  <dsmith@redhat.com>

	* systemtap.spec.in: Fedora Packaging Guidelines updates.  Updated
	BuildRoot macro value to Fedora Extras standard value.  No longer
	uses %makeinstall macro.  The rpm now owns the
	/usr/libexec/systemtap directory.
---
 ChangeLog         | 7 +++++++
 systemtap.spec.in | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index ebb9e1cd..fc8c56ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-27  David Smith  <dsmith@redhat.com>
+
+	* systemtap.spec.in: Fedora Packaging Guidelines updates.  Updated
+	BuildRoot macro value to Fedora Extras standard value.  No longer
+	uses %makeinstall macro.  The rpm now owns the
+	/usr/libexec/systemtap directory.
+
 2007-02-26  David Smith  <dsmith@redhat.com>
 
 	* Makefile.am: Removed 'update-examples' target.  Moved
diff --git a/systemtap.spec.in b/systemtap.spec.in
index 789fe25d..52019164 100644
--- a/systemtap.spec.in
+++ b/systemtap.spec.in
@@ -33,7 +33,7 @@ License: GPL
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz
 
-BuildRoot: %{_tmppath}/%{name}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires: kernel >= 2.6.9-11
 BuildRequires: glib2-devel >= 2.0.0
@@ -110,7 +110,7 @@ find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+sta
 %install
 rm -rf ${RPM_BUILD_ROOT}
 
-%makeinstall
+make DESTDIR=$RPM_BUILD_ROOT install
 
 mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
 
@@ -129,7 +129,7 @@ rm -rf ${RPM_BUILD_ROOT}
 %{_bindir}/lket-b2a
 %{_mandir}/man1/*
 %{_mandir}/man5/*
-%{_libexecdir}/systemtap/*
+%{_libexecdir}/systemtap
 
 %dir %{_datadir}/systemtap
 %{_datadir}/systemtap/runtime
-- 
cgit