From 8b061be6644dbff3554495eda0e245d33d193373 Mon Sep 17 00:00:00 2001
From: roland <roland@fedoraproject.org>
Date: Wed, 19 Jul 2006 22:32:14 +0000
Subject: [PATCH] Version 0.5.9

---
 .cvsignore     |  4 ++--
 sources        |  4 ++--
 systemtap.spec | 37 ++++++++++++++++++++++++++++---------
 3 files changed, 32 insertions(+), 13 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index a9c285b..13e7e2d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-elfutils-0.111.tar.gz
-systemtap-0.2.2.tar.gz
+systemtap-0.5.9.tar.gz
+elfutils-0.122.tar.gz
diff --git a/sources b/sources
index 9747820..33f2367 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-9f06c069faf89454b65a0faf9b544975  systemtap-0.5.8.tar.gz
-5f6372f28b5ca98403b4d1b154b843ad  elfutils-0.121.tar.gz
+35ed51e45bbd9db9a0aa132a442382d7  systemtap-0.5.9.tar.gz
+d83e9022eb342eede549dd6d6a537b59  elfutils-0.122.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index c4b97f9..ee60785 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,10 +1,32 @@
-# Yo!  DO NOT THE FOLLOWING LINE.
+# Release number for rpm build.  Stays at 1 for new PACKAGE_VERSION increases.
+%define release 1
+# Version number of oldest elfutils release that works with systemtap.
+%define elfutils_version 0.122
+
+# Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer.
+%if 0%{?fedora}
+%define bundled_elfutils 1
+%if "%fedora" >= "6"
 %define bundled_elfutils 0
-%define elfutils_version 0.121
+%endif
+%endif
+
+%if 0%{?rhel}
+%define bundled_elfutils 1
+%if "%rhel" >= "5"
+%define bundled_elfutils 0
+%endif
+%endif
+
+%if 0%{!?bundled_elfutils:1}
+# Yo!  DO NOT TOUCH THE FOLLOWING LINE.
+# You can use rpmbuild --define "bundled_elfutils 0" for a build of your own.
+%define bundled_elfutils 1
+%endif
 
 Name: systemtap
-Version: 0.5.8
-Release: 2.1
+Version: 0.5.9
+Release: %{release}%{?dist}
 Summary: Instrumentation System
 Group: Development/System
 License: GPL
@@ -104,11 +126,8 @@ rm -rf ${RPM_BUILD_ROOT}
 
 
 %changelog
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 0.5.8-2.1
-- rebuild
-
-* Fri Jun 16 2006 Roland McGrath <roland@redhat.com> - 0.5.8-2
-- Rebuilt for devel
+* Wed Jul 19 2006 Roland McGrath <roland@redhat.com> - 0.5.9-1
+- PRs 2669, 2913
 
 * Fri Jun 16 2006 Roland McGrath <roland@redhat.com> - 0.5.8-1
 - PRs 2627, 2520, 2228, 2645