Accepting request 107476 from home:jones_tony:branches:devel:tools

OBS-URL: https://build.opensuse.org/request/show/107476
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=47

0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch

@@ -1,27 +0,0 @@
-From e281908fcbcb10a848e109d23c3ca4f2d2ef0a40 Mon Sep 17 00:00:00 2001
-From: "Frank Ch. Eigler" <fche@redhat.com>
-Date: Thu, 22 Sep 2011 11:53:13 -0400
-Subject: PR13216: set AM_GNU_GETTEXT_VERSION(0.17) in configury
-Git-commit: e281908fcbcb10a848e109d23c3ca4f2d2ef0a40
-Patch-mainline: yes
-
-
-Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
----
- configure.ac         |    2 +-
- testsuite/aclocal.m4 |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index ce3121e..c8b90de 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
- AC_SUBST(CFLAGS)
- AC_SUBST(CXXFLAGS)
- AM_GNU_GETTEXT(external)
--AM_GNU_GETTEXT_VERSION
-+AM_GNU_GETTEXT_VERSION(0.15)
- AC_CHECK_FUNCS(ppoll)
- 
- dnl Handle the prologues option.

systemtap-1.6.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:18e3f346d2fb0a2a9e5980351da1052a884466598f76d971fb1c18e6aed1d8bb
-size 1701974

systemtap-1.7.tar.bz2

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

systemtap-docs-autoconf-version.diff

@@ -0,0 +1,19 @@
+From: Tony Jones <tonyj@suse.de>
+Subject: adjust autoconf version
+References: none
+Upstream: no
+Signed-off-by: Tony Jones <tonyj@suse.de>
+
+diff --git a/configure.ac b/configure.ac
+index ce3121e..c8b90de 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -29,7 +29,7 @@ AC_PROG_MAKE_SET
+ AC_SUBST(CFLAGS)
+ AC_SUBST(CXXFLAGS)
+ AM_GNU_GETTEXT(external)
+-AM_GNU_GETTEXT_VERSION(0.17)
++AM_GNU_GETTEXT_VERSION(0.15)
+ AC_CHECK_FUNCS(ppoll)
+ 
+ dnl Handle the prologues option.

systemtap-docs.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Feb 18 01:36:46 UTC 2012 - tonyj@suse.com
+
+- Update to version 1.7.  See systemtap.spec for changelog
+
 -------------------------------------------------------------------
 Sun Jan 29 06:34:11 UTC 2012 - coolo@suse.com
 

systemtap-docs.spec

@@ -26,7 +26,7 @@ BuildRequires:  pkg-config
 BuildRequires:  xmlto
 BuildRequires:  fop
 BuildRequires:  latex2html
-Version:        1.6
+Version:        1.7
 Release:        0
 Summary:        Documents and examples for systemtap
 License:        GPL-2.0+
@@ -36,7 +36,7 @@ Source:         systemtap-%{version}.tar.bz2
 Source2:        README-BEFORE-ADDING-PATCHES
 Patch1:         systemtap-docdir-fix.diff
 Patch2:         systemtap-xmlto-fop.diff
-Patch3:         0001-PR13216-set-AM_GNU_GETTEXT_VERSION-0.17-in-configury.patch
+Patch3:         systemtap-docs-autoconf-version.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 

systemtap.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Sat Feb 18 01:33:56 UTC 2012 - tonyj@suse.com
+
+- Upgrade to version 1.7
+  Changelog: http://sourceware.org/ml/systemtap/2012-q1/msg00097.html
+
 -------------------------------------------------------------------
 Wed Nov 23 14:30:33 CET 2011 - aj@suse.de
 

systemtap.spec

@@ -27,7 +27,7 @@ BuildRequires:  mozilla-nss-tools
 BuildRequires:  pkg-config
 BuildRequires:  sqlite-devel
 BuildRequires:  systemd
-Version:        1.6
+Version:        1.7
 Release:        0
 Summary:        Instrumentation System
 License:        GPL-2.0+