OBS User unknown 2009-05-08 15:11:33 +00:00 committed by Git OBS Bridge
parent 208b23a622
commit 8e9ae4f2b9
6 changed files with 47 additions and 29 deletions

3
systemtap-0.9.7.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5cd5d1e900f27d8406574ea86f70cc1fa7f650e92b05ea30f82297ec8f5e6c6c
size 1091497

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7ccaab67e7ec4f18d19dd7993e1bfa1e5017cf23db7e37b4707ae991e697dced
size 1163238

View File

@ -1,8 +1,13 @@
diff --git a/Makefile.am b/Makefile.am ---
index 945afda..4678c2b 100644 Makefile.am | 2 +-
doc/Makefile.am | 2 +-
doc/SystemTap_Tapset_Reference/Makefile.am | 4 ++--
stapex.3stap.in | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
--- a/Makefile.am --- a/Makefile.am
+++ b/Makefile.am +++ b/Makefile.am
@@ -213,7 +213,7 @@ install-data-local: @@ -218,7 +218,7 @@
| while read f; do if test -x $$f; then \ | while read f; do if test -x $$f; then \
i_cmd="$(INSTALL_PROGRAM)"; else \ i_cmd="$(INSTALL_PROGRAM)"; else \
i_cmd="$(INSTALL_DATA)"; fi; \ i_cmd="$(INSTALL_DATA)"; fi; \
@ -11,8 +16,6 @@ index 945afda..4678c2b 100644
test -e $(DESTDIR)$(sysconfdir)/systemtap || mkdir -p $(DESTDIR)$(sysconfdir)/systemtap test -e $(DESTDIR)$(sysconfdir)/systemtap || mkdir -p $(DESTDIR)$(sysconfdir)/systemtap
TEST_COV_DIR = coverage TEST_COV_DIR = coverage
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 55291f7..6693f11 100644
--- a/doc/Makefile.am --- a/doc/Makefile.am
+++ b/doc/Makefile.am +++ b/doc/Makefile.am
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
@ -24,8 +27,6 @@ index 55291f7..6693f11 100644
SUBDIRS = SystemTap_Tapset_Reference SUBDIRS = SystemTap_Tapset_Reference
if BUILD_DOCS if BUILD_DOCS
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am
index 9e7d206..557c432 100644
--- a/doc/SystemTap_Tapset_Reference/Makefile.am --- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
@ -34,17 +35,15 @@ index 9e7d206..557c432 100644
-DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap -DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap
+DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap +DOC_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/packages/systemtap
MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man5 MAN_INSTALL_DIR = $(DESTDIR)$(mandir)/man3
-HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets -HTML_INSTALL_DIR = $(DESTDIR)$(datadir)/doc/systemtap/tapsets
+HTML_INSTALL_DIR = $(DOC_INSTALL_DIR)/tapsets +HTML_INSTALL_DIR = $(DOC_INSTALL_DIR)/tapsets
### ###
diff --git a/stapex.5.in b/stapex.5.in --- a/stapex.3stap.in
index 38f30f6..eb753d4 100644 +++ b/stapex.3stap.in
--- a/stapex.5.in @@ -114,12 +114,12 @@
+++ b/stapex.5.in
@@ -114,12 +114,12 @@ To list the probeable functions and local variables in the kernel, use another l
.SH MORE EXAMPLES .SH MORE EXAMPLES
Larger examples, demos and samples can be found in Larger examples, demos and samples can be found in
@ -57,5 +56,5 @@ index 38f30f6..eb753d4 100644
-.BR @prefix@/doc/systemtap*/examples -.BR @prefix@/doc/systemtap*/examples
+.BR @prefix@/share/doc/packages/systemtap/examples +.BR @prefix@/share/doc/packages/systemtap/examples
.IR stap (1) .IR stap (1)
.IR stapprobes (5) .IR stapprobes (3stap)
.IR stapfuncs (5) .IR stapfuncs (3stap)

View File

@ -1,15 +1,17 @@
diff --git a/doc/SystemTap_Tapset_Reference/Makefile.am b/doc/SystemTap_Tapset_Reference/Makefile.am ---
index 9e7d206..efd627c 100644 doc/SystemTap_Tapset_Reference/Makefile.am | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
--- a/doc/SystemTap_Tapset_Reference/Makefile.am --- a/doc/SystemTap_Tapset_Reference/Makefile.am
+++ b/doc/SystemTap_Tapset_Reference/Makefile.am +++ b/doc/SystemTap_Tapset_Reference/Makefile.am
@@ -33,7 +33,9 @@ stamp-htmldocs: tapsets.xml @@ -34,7 +34,9 @@
touch stamp-htmldocs
# bump up the allocated space so "xmlto pdf" works
tapsets.pdf: tapsets.xml tapsets.pdf: tapsets.xml
- xmlto pdf tapsets.xml - env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml
+# xmlto pdf tapsets.xml +# env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml
+ xmlto fo tapsets.xml + xmlto fo tapsets.xml
+ fop tapsets.fo tapsets.pdf + fop tapsets.fo tapsets.pdf
stamp-mandocs: tapsets.xml stamp-mandocs: tapsets.xml
xmlto man -o man5 tapsets.xml xmlto man -o man3 tapsets.xml

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri May 8 16:43:08 CEST 2009 - tiwai@suse.de
- updated to released version 0.9.7:
* Lots of fixes, improvements, see NEWS file for details
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Feb 19 16:55:48 CET 2009 - tiwai@suse.de Thu Feb 19 16:55:48 CET 2009 - tiwai@suse.de

View File

@ -1,5 +1,5 @@
# #
# spec file for package systemtap (Version 0.8) # spec file for package systemtap (Version 0.9.7)
# #
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
@ -27,15 +27,20 @@ BuildRequires: xmlto
BuildRequires: fop BuildRequires: fop
BuildRequires: latex2html BuildRequires: latex2html
%endif %endif
%define package_version 20090214 %define use_snapshot 0
License: GPL v2 or later License: GPL v2 or later
Version: 0.8 Version: 0.9.7
Release: 1 Release: 1
Summary: Instrumentation System Summary: Instrumentation System
Group: Development/Tools/Debuggers Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/ Url: http://sourceware.org/systemtap/
# Requires: kernel-source gcc make # Requires: kernel-source gcc make
# Suggest: kernel-smp-debuginfo # Suggest: kernel-smp-debuginfo
%if %use_snapshot
%define package_version 20090214
%else
%define package_version %{version}
%endif
Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2 Source: ftp://sources.redhat.com/pub/systemtap/snapshots/systemtap-%{package_version}.tar.bz2
Patch: systemtap-docdir-fix.diff Patch: systemtap-docdir-fix.diff
Patch2: systemtap-ioblock-suse-kernel-fix.diff Patch2: systemtap-ioblock-suse-kernel-fix.diff
@ -58,8 +63,11 @@ Authors:
Tom Zanussi <zanussi@us.ibm.com> Tom Zanussi <zanussi@us.ibm.com>
%prep %prep
# %setup -n %{name}-%{package_version} -q -a1 %if %use_snapshot
%setup -n src -q %setup -n src -q
%else
%setup -n %{name}-%{package_version} -q
%endif
%patch -p1 %patch -p1
%patch2 %patch2
%if %suse_version > 1030 %if %suse_version > 1030
@ -94,6 +102,9 @@ rm -rf ${RPM_BUILD_ROOT}
%dir %attr(0755,root,root) /var/cache/systemtap %dir %attr(0755,root,root) /var/cache/systemtap
%changelog %changelog
* Fri May 08 2009 tiwai@suse.de
- updated to released version 0.9.7:
* Lots of fixes, improvements, see NEWS file for details
* Thu Feb 19 2009 tiwai@suse.de * Thu Feb 19 2009 tiwai@suse.de
- updated to systemtap snashot 20090214: - updated to systemtap snashot 20090214:
* Version bump to 0.8 * Version bump to 0.8