From e00aa353b812de3a8d7e638f21e65591daec0d843da4122c1ca54432dc54da87 Mon Sep 17 00:00:00 2001 From: Tony Jones Date: Sat, 3 May 2014 05:56:24 +0000 Subject: [PATCH] Accepting request 232503 from home:jones_tony:branches:devel:tools OBS-URL: https://build.opensuse.org/request/show/232503 OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=69 --- langref.tex-add-option-to-babel-setup.patch | 23 --------------------- systemtap-2.4.tar.gz | 3 --- systemtap-2.5.tar.gz | 3 +++ systemtap-docs-autoconf-version.diff | 21 ------------------- systemtap-docs.changes | 8 +++++++ systemtap-docs.spec | 6 ++---- systemtap.changes | 7 +++++++ systemtap.spec | 5 +++-- 8 files changed, 23 insertions(+), 53 deletions(-) delete mode 100644 langref.tex-add-option-to-babel-setup.patch delete mode 100644 systemtap-2.4.tar.gz create mode 100644 systemtap-2.5.tar.gz delete mode 100644 systemtap-docs-autoconf-version.diff diff --git a/langref.tex-add-option-to-babel-setup.patch b/langref.tex-add-option-to-babel-setup.patch deleted file mode 100644 index 5d26c70..0000000 --- a/langref.tex-add-option-to-babel-setup.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Frank Ch. Eigler -Git-commit 8aadd85f895c56161981b6577e412ba6455c5b9d -Subject: langref.tex: add [english] option to babel setup -Date: Tue Dec 17 17:34:43 2013 -0500 - - langref.tex: add [english] option to babel setup - - Reported-By: Tony Jones - -diff --git a/doc/langref.tex b/doc/langref.tex -index d0c0508..bf86231 100644 ---- a/doc/langref.tex -+++ b/doc/langref.tex -@@ -42,7 +42,8 @@ - \item[]} - {\end{list}} - --\usepackage{babel} -+\usepackage[english]{babel} -+ - \makeatother - \begin{document} - diff --git a/systemtap-2.4.tar.gz b/systemtap-2.4.tar.gz deleted file mode 100644 index cf5847e..0000000 --- a/systemtap-2.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:fdcee37c4db188819a69f67a72ad1977251e80673cebf729a443b6c00be779f4 -size 2664988 diff --git a/systemtap-2.5.tar.gz b/systemtap-2.5.tar.gz new file mode 100644 index 0000000..e65a439 --- /dev/null +++ b/systemtap-2.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fdd9e2c6f6325790d3c6c68ada8fa895babbecc1ed7c9e531080e946c2eef075 +size 2767649 diff --git a/systemtap-docs-autoconf-version.diff b/systemtap-docs-autoconf-version.diff deleted file mode 100644 index c99dec6..0000000 --- a/systemtap-docs-autoconf-version.diff +++ /dev/null @@ -1,21 +0,0 @@ -From: Tony Jones -Subject: adjust autoconf version -References: none -Upstream: no -Signed-off-by: Tony Jones - ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -33,7 +33,7 @@ AC_SUBST(CFLAGS) - AC_SUBST(CXXFLAGS) - AC_SYS_LARGEFILE - AM_GNU_GETTEXT(external) --AM_GNU_GETTEXT_VERSION(0.17) -+AM_GNU_GETTEXT_VERSION(0.18) - AC_CHECK_FUNCS(ppoll) - AC_CHECK_FUNCS(openat) - diff --git a/systemtap-docs.changes b/systemtap-docs.changes index b37a747..43b50f1 100644 --- a/systemtap-docs.changes +++ b/systemtap-docs.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri May 2 19:50:28 UTC 2014 - tonyj@suse.com + +- Update to version 2.5. See systemtap.spec for changelog +- Drop patch: langref.tex-add-option-to-babel-setup.patch (upstream) +- Patch systemtap-docs-autoconf-version.diff was still present + despite being "dropped" in 2.4, really delete it + ------------------------------------------------------------------- Thu Dec 19 22:05:14 UTC 2013 - tonyj@suse.com diff --git a/systemtap-docs.spec b/systemtap-docs.spec index babac63..b1ddc88 100644 --- a/systemtap-docs.spec +++ b/systemtap-docs.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap-docs # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -37,7 +37,7 @@ BuildRequires: tex(fancyvrb.sty) BuildRequires: tex(float.sty) BuildRequires: tex(fullpage.sty) -Version: 2.4 +Version: 2.5 Release: 0 Summary: Documents and examples for systemtap License: GPL-2.0+ @@ -47,7 +47,6 @@ Source: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version Source2: README-BEFORE-ADDING-PATCHES Patch1: systemtap-docdir-fix.diff Patch2: systemtap-xmlto-fop.diff -Patch3: langref.tex-add-option-to-babel-setup.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -59,7 +58,6 @@ This package contains the documents and examples for systemtap. %setup -n systemtap-%{version} -q %patch1 -p1 %patch2 -p1 -%patch3 -p1 %build # fix interpreter diff --git a/systemtap.changes b/systemtap.changes index bdb655a..1d0e43a 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri May 2 19:48:19 UTC 2014 - tonyj@suse.com + +- Update to version 2.5 + Changelog: + 2.5: https://sourceware.org/ml/systemtap/2014-q2/msg00103.html + ------------------------------------------------------------------- Fri Nov 15 18:51:03 UTC 2013 - tonyj@suse.com diff --git a/systemtap.spec b/systemtap.spec index 9fcbc11..e3a319c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -1,7 +1,7 @@ # # spec file for package systemtap # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -27,7 +27,7 @@ BuildRequires: mozilla-nss-tools BuildRequires: pkg-config BuildRequires: sqlite-devel BuildRequires: systemd -Version: 2.4 +Version: 2.5 Release: 0 Summary: Instrumentation System License: GPL-2.0+ @@ -139,6 +139,7 @@ systemd-tmpfiles --create /usr/lib/tmpfiles.d/stap-server.conf %{_libexecdir}/%{name}/stap-env %{_libexecdir}/%{name}/stap-authorize-cert %{_mandir}/man8/staprun.8* +%{_mandir}/man8/systemtap.8* %{_mandir}/man8/stapsh.8* %files server