From 3b30fa9fcbef59eff95230ec8f0ee01e952fc85a Mon Sep 17 00:00:00 2001
From: Josh Stone <jistone@fedoraproject.org>
Date: Wed, 23 Sep 2009 02:25:47 +0000
Subject: [PATCH] upstream release 1.0

---
 .cvsignore                       |  2 +-
 dtrace-default-output-path.patch | 20 ----------------
 sources                          |  2 +-
 systemtap.spec                   | 39 ++++++++++++++------------------
 4 files changed, 19 insertions(+), 44 deletions(-)
 delete mode 100644 dtrace-default-output-path.patch

diff --git a/.cvsignore b/.cvsignore
index 5b967c4..5e9d38a 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-systemtap-0.9.9.tar.gz
+systemtap-1.0.tar.gz
diff --git a/dtrace-default-output-path.patch b/dtrace-default-output-path.patch
deleted file mode 100644
index aa6b33e..0000000
--- a/dtrace-default-output-path.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-commit 1b8fc7c8a443c0a8982133da6cc22a0c986a4ad4
-Author: Stan Cox <scox@redhat.com>
-Date:   Fri Aug 28 17:16:00 2009 -0400
-
-    Have dtrace use [wd] as the default dir when -o isn't given.
-    
-    * dtrace.in: Generate the output file from basename of input filename.
-
-diff --git a/dtrace.in b/dtrace.in
-index 168bfb1..5365c31 100755
---- a/dtrace.in
-+++ b/dtrace.in
-@@ -162,6 +162,7 @@ if (build_header == False and build_source == False):
- if (filename == ""):
-     if (s_filename != ""):
- 	(filename,ext) = os.path.splitext(s_filename)
-+        filename = os.path.basename(filename)
-     else:
-         usage
-         sys.exit(1)
diff --git a/sources b/sources
index 37e08a2..c9f92fb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-4625fab536d4eddf85f0da985c5f6caa  systemtap-0.9.9.tar.gz
+e11c9ec18f3b269b846054e9ca33011a  systemtap-1.0.tar.gz
diff --git a/systemtap.spec b/systemtap.spec
index 0bf1e3e..960d2e1 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -8,8 +8,8 @@
 %{!?with_grapher: %define with_grapher 1}
 
 Name: systemtap
-Version: 0.9.9
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 # for version, see also configure.ac
 Summary: Instrumentation System
 Group: Development/System
@@ -49,8 +49,6 @@ BuildRequires: elfutils-devel >= %{elfutils_version}
 Requires: crash
 %endif
 
-Patch2: dtrace-default-output-path.patch
-
 %if %{with_docs}
 BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html
 # On F10, xmlto's pdf support was broken off into a sub-package,
@@ -86,7 +84,7 @@ Summary: Instrumentation System Testsuite
 Group: Development/System
 License: GPLv2+
 URL: http://sourceware.org/systemtap/
-Requires: systemtap systemtap-sdt-devel dejagnu
+Requires: systemtap systemtap-sdt-devel dejagnu which
 
 %description testsuite
 The testsuite allows testing of the entire SystemTap toolchain
@@ -99,11 +97,13 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap-runtime = %{version}-%{release}
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description client
-SystemTap client is the client component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation client component of systemtap.
+It relies on a nearby compilation server to translate systemtap
+scripts to kernel objects, so a client workstation only needs the
+runtime, and not the compiler/etc toolchain.
 
 %package server
 Summary: Instrumentation System Server
@@ -112,11 +112,12 @@ License: GPLv2+
 URL: http://sourceware.org/systemtap/
 Requires: systemtap
 Requires: avahi avahi-tools nss nss-tools mktemp
+Requires: zip unzip
 
 %description server
-SystemTap server is the server component of an instrumentation
-system for systems running Linux 2.6.  Developers can write
-instrumentation to collect data on the operation of the system.
+This is the remote script compilation server component of systemtap.
+It announces itself to local clients with avahi, and compiles systemtap
+scripts to kernel objects on their demand.
 
 %package sdt-devel
 Summary: Static probe support tools
@@ -163,8 +164,6 @@ find . \( -name configure -o -name config.h.in \) -print | xargs touch
 cd ..
 %endif
 
-%patch2 -p1
-
 %build
 
 %if %{with_bundled_elfutils}
@@ -343,6 +342,8 @@ exit 0
 %{_bindir}/stap-client
 %{_bindir}/stap-env
 %{_bindir}/stap-find-servers
+%{_bindir}/stap-authorize-cert
+%{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-client-connect
 %{_mandir}/man8/stap-server.8*
 
@@ -359,6 +360,7 @@ exit 0
 %{_bindir}/stap-authorize-cert
 %{_bindir}/stap-authorize-server-cert
 %{_bindir}/stap-server-connect
+%{_bindir}/stap-sign-module
 %{_mandir}/man8/stap-server.8*
 
 %files sdt-devel
@@ -385,15 +387,8 @@ exit 0
 
 
 %changelog
-* Fri Sep  4 2009 Josh Stone <jistone@redhat.com> - 0.9.9-4
-- Fix the default output path of dtrace (upstream commit 3a45db13)
-
-* Wed Aug 12 2009 Josh Stone <jistone@redhat.com> - 0.9.9-3
-- Fix uprobes error suppression in %post and %preun (#515870)
-  (upstream commit 70f2bd1fc3db8e2b555234d45e6bc3856d8afee5)
-
-* Tue Aug  4 2009 Josh Stone <jistone@redhat.com> - 0.9.9-2
-- Rebuild with correct sources.
+* Tue Sep 22 2009 Josh Stone <jistone@redhat.com> - 1.0-1
+- Upstream release.
 
 * Tue Aug  4 2009 Josh Stone <jistone@redhat.com> - 0.9.9-1
 - Upstream release.