upstream release 1.3

.cvsignore

@@ -1 +1 @@
-systemtap-1.2.tar.gz
+systemtap-1.3.tar.gz

sources

@@ -1 +1 @@
-8761f9a55f9de6fa4020f52f15ece39b  systemtap-1.2.tar.gz
+044a0d225de53498fb62d25724af3fd7  systemtap-1.3.tar.gz

systemtap-1.2-fix-sparc.patch

@@ -1,12 +0,0 @@
-diff -up systemtap-1.2/includes/sys/sdt.h.BAD systemtap-1.2/includes/sys/sdt.h
---- systemtap-1.2/includes/sys/sdt.h.BAD	2010-03-24 11:30:50.694520827 -0400
-+++ systemtap-1.2/includes/sys/sdt.h	2010-03-24 11:44:29.062420646 -0400
-@@ -72,7 +72,7 @@
- #define STAP_UNINLINE
- #endif
- 
--#if defined __x86_64__ || defined __i386__  || defined __powerpc__ || defined __arm__
-+#if defined __x86_64__ || defined __i386__  || defined __powerpc__ || defined __arm__ || defined __sparc__
- #define STAP_NOP "\tnop "
- #else
- #define STAP_NOP "\tnop 0 "

systemtap.spec

@@ -1,6 +1,6 @@
 %{!?with_sqlite: %global with_sqlite 1}
 %{!?with_docs: %global with_docs 1}
-%{!?with_crash: %global with_crash 0}
+%{!?with_crash: %global with_crash 1}
 %{!?with_rpm: %global with_rpm 1}
 %{!?with_bundled_elfutils: %global with_bundled_elfutils 0}
 %{!?elfutils_version: %global elfutils_version 0.127}
@@ -11,8 +11,8 @@
 %{!?publican_brand: %global publican_brand fedora}
 
 Name: systemtap
-Version: 1.2
+Version: 1.3
-Release: 2%{?dist}
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -42,7 +42,7 @@ Requires: kernel-devel
 Requires: gcc make
 # Suggest: kernel-debuginfo
 Requires: systemtap-runtime = %{version}-%{release}
-BuildRequires: nss-devel nss-tools pkgconfig
+BuildRequires: nss-tools nss-devel avahi-devel pkgconfig
 
 %if %{with_bundled_elfutils}
 Source1: elfutils-%{elfutils_version}.tar.gz
@@ -52,9 +52,6 @@ BuildRequires: m4
 %else
 BuildRequires: elfutils-devel >= %{elfutils_version}
 %endif
-%if %{with_crash}
-Requires: crash
-%endif
 
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
@@ -64,7 +61,7 @@ BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 BuildRequires: xmlto /usr/share/xmlto/format/fo/pdf
 %if %{with_publican}
 BuildRequires: publican
-BuildRequires: publican-%{publican_brand}
+BuildRequires: /usr/share/publican/Common_Content/%{publican_brand}/defaults.cfg
 %endif
 %endif
 
@@ -78,9 +75,6 @@ BuildRequires: boost-devel
 %endif
 %endif
 
-# http://sources.redhat.com/bugzilla/show_bug.cgi?id=11427
-Patch2: systemtap-1.2-fix-sparc.patch
-
 %description
 SystemTap is an instrumentation system for systems running Linux 2.6.
 Developers can write instrumentation to collect data on the operation
@@ -104,7 +98,7 @@ Summary: Instrumentation System Testsuite
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap systemtap-sdt-devel dejagnu which
+Requires: systemtap systemtap-sdt-devel dejagnu which prelink
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -146,7 +140,7 @@ scripts to kernel objects on their demand.
 %package sdt-devel
 Summary: Static probe support tools
 Group: Development/System
-License: GPLv2+
+License: GPLv2+, Public Domain
 URL: http://sourceware.org/systemtap/
 
 %description sdt-devel
@@ -192,8 +186,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
 cd ..
 %endif
 
-%patch2 -p1 -b .sparc
-
 %build
 
 %if %{with_bundled_elfutils}
@@ -342,7 +334,7 @@ test -e %{_localstatedir}/log/stap-server/log || {
      chmod 664 %{_localstatedir}/log/stap-server/log
      chown stap-server:stap-server %{_localstatedir}/log/stap-server/log
 }
-# If it does not already exit, as stap-server, generate the certificate
+# If it does not already exist, as stap-server, generate the certificate
 # used for signing and for ssl.
 if test ! -e ~stap-server/.systemtap/ssl/server/stap.cert; then
    runuser -s /bin/sh - stap-server -c %{_libexecdir}/%{name}/stap-gen-cert >/dev/null
@@ -421,20 +413,15 @@ exit 0
 %{_bindir}/stap-report
 %{_mandir}/man1/*
 %{_mandir}/man3/*
+%{_mandir}/man7/stappaths.7*
 
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/runtime
 %{_datadir}/%{name}/tapset
 
-%if %{with_bundled_elfutils} || %{with_crash}
-%dir %{_libdir}/%{name}
-%endif
 %if %{with_bundled_elfutils}
 %{_libdir}/%{name}/lib*.so*
 %endif
-%if %{with_crash}
-%{_libdir}/%{name}/staplog.so*
-%endif
 
 # Make sure that the uprobes module can be built by root and by the server
 %dir %attr(0775,root,stap-server) %{_datadir}/%{name}/runtime/uprobes
@@ -447,6 +434,10 @@ exit 0
 %{_libexecdir}/%{name}/stapio
 %{_libexecdir}/%{name}/stap-env
 %{_libexecdir}/%{name}/stap-authorize-cert
+%if %{with_crash}
+%{_libdir}/%{name}/staplog.so*
+%endif
+%{_mandir}/man7/stappaths.7*
 %{_mandir}/man8/staprun.8*
 %{_mandir}/man8/stap-authorize-signing-cert.8*
 
@@ -462,6 +453,7 @@ exit 0
 %{_bindir}/stap-authorize-server-cert
 %{_libexecdir}/%{name}/stap-find-servers
 %{_libexecdir}/%{name}/stap-client-connect
+%{_mandir}/man7/stappaths.7*
 %{_mandir}/man8/stap-client.8*
 %{_mandir}/man8/stap-authorize-server-cert.8*
 
@@ -477,6 +469,7 @@ exit 0
 %{_libexecdir}/%{name}/stap-gen-cert
 %{_libexecdir}/%{name}/stap-server-connect
 %{_libexecdir}/%{name}/stap-sign-module
+%{_mandir}/man7/stappaths.7*
 %{_mandir}/man8/stap-server.8*
 %{_mandir}/man8/stap-authorize-server-cert.8*
 %{_sysconfdir}/rc.d/init.d/stap-server
@@ -492,6 +485,7 @@ exit 0
 %defattr(-,root,root)
 %{_bindir}/dtrace
 %{_includedir}/sys/sdt.h
+%doc README AUTHORS NEWS COPYING
 
 %files initscript
 %defattr(-,root,root)
@@ -513,8 +507,8 @@ exit 0
 
 
 %changelog
-* Wed Mar 24 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.2-2
+* Wed Jul 21 2010 Josh Stone <jistone@redhat.com> - 1.3-1
-- fix compilation on sparc
+- Upstream release.
 
 * Mon Mar 22 2010 Frank Ch. Eigler <fche@redhat.com> - 1.2-1
 - Upstream release.