rpms/systemtap/F-7 .cvsignore, 1.8, 1.9 sources, 1.21, 1.22 systemtap.spec, 1.30, 1.31
William Eden Cohen (wcohen)
fedora-extras-commits at redhat.com
Mon Feb 11 21:04:23 UTC 2008
Author: wcohen
Update of /cvs/pkgs/rpms/systemtap/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23019
Modified Files:
.cvsignore sources systemtap.spec
Log Message:
Move to the latest version 0.6.1-3
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-7/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- .cvsignore 26 Mar 2007 16:09:35 -0000 1.8
+++ .cvsignore 11 Feb 2008 21:03:43 -0000 1.9
@@ -1 +1 @@
-systemtap-0.5.13.tar.gz
+systemtap-0.6.1.tar.gz
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-7/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- sources 26 Mar 2007 16:09:36 -0000 1.21
+++ sources 11 Feb 2008 21:03:43 -0000 1.22
@@ -1 +1 @@
-31ed20d6076736f6ffab74d5f7e4c9a3 systemtap-0.5.13.tar.gz
+b501cd7c42b810389892ee39bdf21560 systemtap-0.6.1.tar.gz
Index: systemtap.spec
===================================================================
RCS file: /cvs/pkgs/rpms/systemtap/F-7/systemtap.spec,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- systemtap.spec 26 Mar 2007 17:24:31 -0000 1.30
+++ systemtap.spec 11 Feb 2008 21:03:43 -0000 1.31
@@ -1,20 +1,27 @@
# Release number for rpm build. Stays at 1 for new PACKAGE_VERSION increases.
-%define release 1
+%define release 3
# Version number of oldest elfutils release that works with systemtap.
-%define elfutils_version 0.125
+%define elfutils_version 0.131
+
+# Don't build on ppc for RHEL5
+ExcludeArch: ppc
# Set bundled_elfutils to 0 on systems that have %{elfutils_version} or newer.
%if 0%{?fedora}
%define bundled_elfutils 1
+%define sqlite 0
%if "%fedora" >= "6"
%define bundled_elfutils 0
+%define sqlite 1
%endif
%endif
%if 0%{?rhel}
%define bundled_elfutils 1
-%if "%rhel" >= "5"
+%define sqlite 0
+%if "%rhel" >= "6"
%define bundled_elfutils 0
+%define sqlite 1
%endif
%endif
@@ -24,28 +31,38 @@
%define bundled_elfutils 1
%endif
+%if 0%{!?sqlite:1}
+# Yo! DO NOT TOUCH THE FOLLOWING LINE.
+# You can use rpmbuild --define "sqlite 1" for a build of your own.
+%define sqlite 0
+%endif
+
Name: systemtap
-Version: 0.5.13
+Version: 0.6.1
Release: %{release}%{?dist}
Summary: Instrumentation System
Group: Development/System
-License: GPL
+License: GPLv2+
URL: http://sourceware.org/systemtap/
-Source: ftp://sourceware.org/pub/%{name}/%{name}-%{version}.tar.gz
+Source: ftp://sourceware.org/pub/%{name}/releases/%{name}-%{version}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: kernel >= 2.6.9-11
-BuildRequires: glib2-devel >= 2.0.0
-# make check
-BuildRequires: dejagnu
-Requires: glib2 >= 2.0.0
+BuildRequires: libcap-devel
+%if %{sqlite}
+BuildRequires: sqlite-devel
+Requires: sqlite
+%endif
+%if "%rhel" >= "5"
+BuildRequires: crash-devel zlib-devel
+%endif
# Requires: kernel-devel
# or is that kernel-smp-devel? kernel-hugemem-devel?
Requires: gcc make
# Suggest: kernel-debuginfo
Requires: systemtap-runtime = %{version}-%{release}
-Requires: sudo
+Requires(pre): shadow-utils
%if %{bundled_elfutils}
Source1: elfutils-%{elfutils_version}.tar.gz
@@ -63,7 +80,7 @@
%package runtime
Summary: Instrumentation System Runtime
Group: Development/System
-License: GPL
+License: GPLv2+
URL: http://sourceware.org/systemtap/
Requires: kernel >= 2.6.9-11
@@ -72,6 +89,17 @@
system for systems running Linux 2.6. Developers can write
instrumentation to collect data on the operation of the system.
+%package testsuite
+Summary: Instrumentation System Testsuite
+Group: Development/System
+License: GPLv2+
+URL: http://sourceware.org/systemtap/
+Requires: systemtap dejagnu
+
+%description testsuite
+The testsuite allows testing of the entire SystemTap toolchain
+without having to rebuild from sources.
+
%prep
%setup -q %{?setup_elfutils}
@@ -102,11 +130,16 @@
%define elfutils_mflags LD_LIBRARY_PATH=`pwd`/lib-elfutils
%endif
-%configure %{?elfutils_config}
-make %{?_smp_mflags} AM_CFLAGS="-D_GNU_SOURCE -fexceptions -Wall -Wextra"
+%if %{sqlite}
+# Include the coverage testing support
+%define sqlite_config --enable-sqlitedb
+%endif
+
+%configure %{?elfutils_config} %{?sqlite_config}
+make %{?_smp_mflags}
-# Fix paths in the example scripts
-find examples -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
+# Fix paths in the example & testsuite scripts
+find examples testsuite -type f -name '*.stp' -print0 | xargs -0 sed -i -r -e '1s@^#!.+stap@#!%{_bindir}/stap@'
# To avoid perl dependency, make perl sample script non-executable
chmod -x examples/samples/kmalloc-top
@@ -115,19 +148,35 @@
rm -rf ${RPM_BUILD_ROOT}
make DESTDIR=$RPM_BUILD_ROOT install
-%check
-make check %{?elfutils_mflags} || :
+# Because "make install" may install staprun with mode 04111, the
+# post-processing programs rpmbuild runs won't be able to read it.
+# So, we change permissions so that they can read it. We'll set the
+# permissions back to 04111 in the %files section below.
+chmod 755 $RPM_BUILD_ROOT%{_bindir}/staprun
+
+# Copy over the testsuite
+cp -rp testsuite $RPM_BUILD_ROOT%{_datadir}/systemtap
+
+if [ -f $RPM_BUILD_ROOT%{_libdir}/%{name}/staplog.so ]; then
+ echo %{_libdir}/%{name}/staplog.so > runtime-addl-files.txt
+else
+ touch runtime-addl-files.txt
+fi
%clean
rm -rf ${RPM_BUILD_ROOT}
+%pre
+getent group stapdev >/dev/null || groupadd -r stapdev
+getent group stapusr >/dev/null || groupadd -r stapusr
+exit 0
+
%files
%defattr(-,root,root)
%doc README AUTHORS NEWS COPYING examples
%{_bindir}/stap
-%{_bindir}/lket-b2a
%{_mandir}/man1/*
%{_mandir}/man5/*
@@ -140,15 +189,48 @@
%{_libdir}/%{name}/lib*.so*
%endif
-%files runtime
+%files runtime -f runtime-addl-files.txt
%defattr(-,root,root)
-%{_bindir}/staprun
+%attr(4111,root,root) %{_bindir}/staprun
%{_libexecdir}/systemtap
%{_mandir}/man8/*
%doc README AUTHORS NEWS COPYING
+%files testsuite
+%defattr(-,root,root)
+%{_datadir}/systemtap/testsuite
+
+
%changelog
+* Fri Feb 1 2008 Frank Ch. Eigler <fche at redhat.com> - 0.6.1-3
+- Add zlib-devel dependency which is supposed to come from crash-devel.
+
+* Fri Feb 1 2008 Frank Ch. Eigler <fche at redhat.com> - 0.6.1-2
+- Process testsuite .stp files to fool "#! stap" dep. finder.
+
+* Fri Jan 18 2008 Frank Ch. Eigler <fche at redhat.com> - 0.6.1-1
+- Add crash-devel buildreq to build staplog.so crash(8) module.
+- Many robustness & functionality improvements:
+
+* Wed Dec 5 2007 Will Cohen <wcohen at redhat.com> - 0.6-2
+- Correct Source to point to location contain code.
+
+* Thu Aug 9 2007 David Smith <dsmith at redhat.com> - 0.6-1
+- Bumped version, added libcap-devel BuildRequires.
+
+* Wed Jul 11 2007 Will Cohen <wcohen at redhat.com> - 0.5.14-2
+- Fix Requires and BuildRequires for sqlite.
+
+* Tue Jul 2 2007 Frank Ch. Eigler <fche at redhat.com> - 0.5.14-1
+- Many robustness improvements: 1117, 1134, 1305, 1307, 1570, 1806,
+ 2033, 2116, 2224, 2339, 2341, 2406, 2426, 2438, 2583, 3037,
+ 3261, 3282, 3331, 3428 3519, 3545, 3625, 3648, 3880, 3888, 3911,
+ 3952, 3965, 4066, 4071, 4075, 4078, 4081, 4096, 4119, 4122, 4127,
+ 4146, 4171, 4179, 4183, 4221, 4224, 4254, 4281, 4319, 4323, 4326,
+ 4329, 4332, 4337, 4415, 4432, 4444, 4445, 4458, 4467, 4470, 4471,
+ 4518, 4567, 4570, 4579, 4589, 4609, 4664
+
* Mon Mar 26 2007 Frank Ch. Eigler <fche at redhat.com> - 0.5.13-1
- An emergency / preliminary refresh, mainly for compatibility
with 2.6.21-pre kernels.
More information about the fedora-extras-commits
mailing list