From 8e9ae4f2b96d986e0fa37ae7d6320ee75ec3344477e72b2d0deaf8bc4d66dabc Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Fri, 8 May 2009 15:11:33 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/systemtap?expand=0&rev=41 --- systemtap-0.9.7.tar.bz2 | 3 +++ systemtap-20090214.tar.bz2 | 3 --- systemtap-docdir-fix.diff | 29 ++++++++++++++--------------- systemtap-xmlto-fop.diff | 16 +++++++++------- systemtap.changes | 6 ++++++ systemtap.spec | 19 +++++++++++++++---- 6 files changed, 47 insertions(+), 29 deletions(-) create mode 100644 systemtap-0.9.7.tar.bz2 delete mode 100644 systemtap-20090214.tar.bz2 diff --git a/systemtap-0.9.7.tar.bz2 b/systemtap-0.9.7.tar.bz2 new file mode 100644 index 0000000..c15c98b --- /dev/null +++ b/systemtap-0.9.7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5cd5d1e900f27d8406574ea86f70cc1fa7f650e92b05ea30f82297ec8f5e6c6c +size 1091497 diff --git a/systemtap-20090214.tar.bz2 b/systemtap-20090214.tar.bz2 deleted file mode 100644 index 007305b..0000000 --- a/systemtap-20090214.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:7ccaab67e7ec4f18d19dd7993e1bfa1e5017cf23db7e37b4707ae991e697dced -size 1163238 diff --git a/systemtap-docdir-fix.diff b/systemtap-docdir-fix.diff index 66fe733..9cb4ad9 100644 --- a/systemtap-docdir-fix.diff +++ b/systemtap-docdir-fix.diff @@ -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 +++ b/Makefile.am -@@ -213,7 +213,7 @@ install-data-local: +@@ -218,7 +218,7 @@ | while read f; do if test -x $$f; then \ i_cmd="$(INSTALL_PROGRAM)"; else \ i_cmd="$(INSTALL_DATA)"; fi; \ @@ -11,8 +16,6 @@ index 945afda..4678c2b 100644 test -e $(DESTDIR)$(sysconfdir)/systemtap || mkdir -p $(DESTDIR)$(sysconfdir)/systemtap TEST_COV_DIR = coverage -diff --git a/doc/Makefile.am b/doc/Makefile.am -index 55291f7..6693f11 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -2,7 +2,7 @@ @@ -24,8 +27,6 @@ index 55291f7..6693f11 100644 SUBDIRS = SystemTap_Tapset_Reference 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 +++ b/doc/SystemTap_Tapset_Reference/Makefile.am @@ -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/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 = $(DOC_INSTALL_DIR)/tapsets ### -diff --git a/stapex.5.in b/stapex.5.in -index 38f30f6..eb753d4 100644 ---- a/stapex.5.in -+++ b/stapex.5.in -@@ -114,12 +114,12 @@ To list the probeable functions and local variables in the kernel, use another l +--- a/stapex.3stap.in ++++ b/stapex.3stap.in +@@ -114,12 +114,12 @@ .SH MORE EXAMPLES Larger examples, demos and samples can be found in @@ -57,5 +56,5 @@ index 38f30f6..eb753d4 100644 -.BR @prefix@/doc/systemtap*/examples +.BR @prefix@/share/doc/packages/systemtap/examples .IR stap (1) - .IR stapprobes (5) - .IR stapfuncs (5) + .IR stapprobes (3stap) + .IR stapfuncs (3stap) diff --git a/systemtap-xmlto-fop.diff b/systemtap-xmlto-fop.diff index f5beb30..033f8fb 100644 --- a/systemtap-xmlto-fop.diff +++ b/systemtap-xmlto-fop.diff @@ -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 +++ b/doc/SystemTap_Tapset_Reference/Makefile.am -@@ -33,7 +33,9 @@ stamp-htmldocs: tapsets.xml - touch stamp-htmldocs +@@ -34,7 +34,9 @@ + # bump up the allocated space so "xmlto pdf" works tapsets.pdf: tapsets.xml -- xmlto pdf tapsets.xml -+# xmlto pdf tapsets.xml +- env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml ++# env pool_size=2000000 hash_extra=2000000 xmlto pdf tapsets.xml + xmlto fo tapsets.xml + fop tapsets.fo tapsets.pdf stamp-mandocs: tapsets.xml - xmlto man -o man5 tapsets.xml + xmlto man -o man3 tapsets.xml diff --git a/systemtap.changes b/systemtap.changes index 9a44109..9f99cb0 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -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 diff --git a/systemtap.spec b/systemtap.spec index 61d7adb..632df44 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -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. # @@ -27,15 +27,20 @@ BuildRequires: xmlto BuildRequires: fop BuildRequires: latex2html %endif -%define package_version 20090214 +%define use_snapshot 0 License: GPL v2 or later -Version: 0.8 +Version: 0.9.7 Release: 1 Summary: Instrumentation System Group: Development/Tools/Debuggers Url: http://sourceware.org/systemtap/ # Requires: kernel-source gcc make # 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 Patch: systemtap-docdir-fix.diff Patch2: systemtap-ioblock-suse-kernel-fix.diff @@ -58,8 +63,11 @@ Authors: Tom Zanussi %prep -# %setup -n %{name}-%{package_version} -q -a1 +%if %use_snapshot %setup -n src -q +%else +%setup -n %{name}-%{package_version} -q +%endif %patch -p1 %patch2 %if %suse_version > 1030 @@ -94,6 +102,9 @@ rm -rf ${RPM_BUILD_ROOT} %dir %attr(0755,root,root) /var/cache/systemtap %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 - updated to systemtap snashot 20090214: * Version bump to 0.8