From 2dc112d41d2c9d8f9bafc5e906c8e1945da23516 Mon Sep 17 00:00:00 2001
From: roland <roland@fedoraproject.org>
Date: Mon, 12 Dec 2005 10:16:46 +0000
Subject: [PATCH] Automatic update to 0.5.1

---
 sources        |  4 ++--
 systemtap.spec | 48 +++++++++---------------------------------------
 2 files changed, 11 insertions(+), 41 deletions(-)

diff --git a/sources b/sources
index f3b3306..0e317d4 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-551b8d57d17c78f756d2876e98028f6e  systemtap-0.5.tar.gz
-bfc77b2f448d8d7e0881bbb3196f3f5d  elfutils-0.116.tar.gz
+6d7bffa4dccd246473eef3283ed40f13  systemtap-0.5.1.tar.gz
+fb8ea485fca0032cc4b4c8fd634b6f46  elfutils-0.118.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 2bceba3..d11e8d7 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,17 +1,15 @@
 %define bundled_elfutils 0
-%define elfutils_version 0.116
+%define elfutils_version 0.118
 
 Name: systemtap
-Version: 0.5
-Release: 2.1
+Version: 0.5.1
+Release: 2
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
 URL: http://sourceware.org/systemtap/
 Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz
 
-ExclusiveArch: %{ix86} x86_64 ppc ia64
-
 BuildRoot: %{_tmppath}/%{name}-root
 
 Requires: kernel >= 2.6.9-11
@@ -50,29 +48,7 @@ cd ..
 
 %if %{bundled_elfutils}
 # Build our own copy of elfutils.
-elfutils_includedir="`pwd`/include-elfutils"
-elfutils_libdir="`pwd`/lib-elfutils"
-mkdir build-elfutils
-cd build-elfutils
-cat > configure <<\EOF
-#!/bin/sh
-exec ../elfutils-%{elfutils_version}/configure "$@"
-EOF
-chmod +x configure
-LDFLAGS=-Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name}
-export LDFLAGS
-%configure --enable-libebl-subdir=%{name}
-make %{?_smp_mflags}
-for dir in libelf libebl libdw libdwfl; do
-  make -C $dir install includedir=$elfutils_includedir libdir=$elfutils_libdir
-done
-cd ..
-
-# We'll configure with these options to use the local headers and libraries.
-CPPFLAGS="-I${elfutils_includedir}"
-LDFLAGS="-L${elfutils_libdir} -Wl,-rpath-link,${elfutils_libdir} \
--Wl,--enable-new-dtags,-rpath,%{_libdir}/%{name}"
-export CPPFLAGS LDFLAGS
+%define elfutils_config --with-elfutils=elfutils-%{elfutils_version}
 
 # We have to prevent the standard dependency generation from identifying
 # our private elfutils libraries in our provides and requires.
@@ -85,7 +61,7 @@ export CPPFLAGS LDFLAGS
 %define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
 %endif
 
-%configure
+%configure %{?elfutils_config}
 make %{?_smp_mflags}
 
 %install
@@ -93,12 +69,6 @@ rm -rf ${RPM_BUILD_ROOT}
 
 %makeinstall
 
-%if %{bundled_elfutils}
-installed_elfutils=${RPM_BUILD_ROOT}%{_libdir}/%{name}
-mkdir -p ${installed_elfutils}
-cp -P lib-elfutils/*.so* lib-elfutils/%{name}/*.so* ${installed_elfutils}/
-%endif
-
 mkdir -p $RPM_BUILD_ROOT/var/cache/systemtap
 
 %check
@@ -130,12 +100,12 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Fri Dec  2 2005 Frank Eigler <fche@redhat.com> - 0.5-2
+* Mon Dec 12 2005 Roland McGrath <roland@redhat.com> - 0.5.1-2
 - Rebuilt for devel
 
+* Wed Dec  7 2005 Roland McGrath <roland@redhat.com> - 0.5.1-1
+- elfutils update, build changes
+
 * Fri Dec 02 2005  Frank Ch. Eigler  <fche@redhat.com> - 0.5-1
 - Many fixes and improvements: 1425, 1536, 1505, 1380, 1329, 1828, 1271,
   1339, 1340, 1345, 1837, 1917, 1903, 1336, 1868, 1594, 1564, 1276, 1295