From 1e6b91b9a3a40ffb7636cb008860fb2135cf50ab317a29625c61fba0f616eb84 Mon Sep 17 00:00:00 2001
From: Tony Jones <tonyj@suse.com>
Date: Fri, 2 Feb 2018 23:46:27 +0000
Subject: [PATCH] Accepting request 572161 from
 home:jones_tony:branches:devel:tools

- Fix python3 build failures

OBS-URL: https://build.opensuse.org/request/show/572161
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=94
---
 systemtap-docs.changes | 5 +++++
 systemtap-docs.spec    | 7 +++++--
 systemtap.spec         | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/systemtap-docs.changes b/systemtap-docs.changes
index 41b6306..12e854a 100644
--- a/systemtap-docs.changes
+++ b/systemtap-docs.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Fri Feb  2 23:31:59 UTC 2018 - tonyj@suse.com
+
+- Fix python3 build failures
+
 -------------------------------------------------------------------
 Mon Nov 20 23:06:17 UTC 2017 - tonyj@suse.com
 
diff --git a/systemtap-docs.spec b/systemtap-docs.spec
index d46ee00..dfdb261 100644
--- a/systemtap-docs.spec
+++ b/systemtap-docs.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap-docs
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@ Source4:        README-KEYRING
 Patch1:         systemtap-docdir-fix.diff
 BuildRequires:  autoconf
 BuildRequires:  automake
+BuildRequires:  python3-devel
+BuildRequires:  python3-setuptools
 # for documents
 BuildRequires:  fop
 BuildRequires:  gcc-c++
@@ -64,7 +66,7 @@ This package contains the documents and examples for systemtap.
 find testsuite examples -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, %{_bindir}/env,'
 find testsuite examples -type f | xargs chmod 644
 autoreconf -fi
-%configure --docdir=%{_docdir}/systemtap --disable-nls
+%configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3 
 make %{?_smp_mflags}
 
 %install
@@ -73,6 +75,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} doc
 cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/
 # remove binaries and runtime stuff
 rm -rf %{buildroot}%{_bindir}
+rm -rf %{buildroot}%{_libdir}
 rm -rf %{buildroot}%{_libexecdir}
 rm -rf %{buildroot}%{_datadir}/systemtap
 rm -rf %{buildroot}%{_includedir}
diff --git a/systemtap.spec b/systemtap.spec
index 8a9e932..348b831 100644
--- a/systemtap.spec
+++ b/systemtap.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package systemtap
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed