SHA256
1
0
forked from pool/systemtap

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
This commit is contained in:
Tony Jones 2018-02-02 23:46:27 +00:00 committed by Git OBS Bridge
parent ec1ad2eea2
commit 1e6b91b9a3
3 changed files with 11 additions and 3 deletions

View File

@ -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 Mon Nov 20 23:06:17 UTC 2017 - tonyj@suse.com

View File

@ -1,7 +1,7 @@
# #
# spec file for package systemtap-docs # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -31,6 +31,8 @@ Source4: README-KEYRING
Patch1: systemtap-docdir-fix.diff Patch1: systemtap-docdir-fix.diff
BuildRequires: autoconf BuildRequires: autoconf
BuildRequires: automake BuildRequires: automake
BuildRequires: python3-devel
BuildRequires: python3-setuptools
# for documents # for documents
BuildRequires: fop BuildRequires: fop
BuildRequires: gcc-c++ 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 -name "*.stp" | xargs -n1 sed -i -e 's, /bin/env, %{_bindir}/env,'
find testsuite examples -type f | xargs chmod 644 find testsuite examples -type f | xargs chmod 644
autoreconf -fi autoreconf -fi
%configure --docdir=%{_docdir}/systemtap --disable-nls %configure --docdir=%{_docdir}/systemtap --disable-nls --with-python3
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -73,6 +75,7 @@ make DESTDIR=%{buildroot} install %{?_smp_mflags} doc
cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/ cp README AUTHORS NEWS %{buildroot}%{_docdir}/systemtap/
# remove binaries and runtime stuff # remove binaries and runtime stuff
rm -rf %{buildroot}%{_bindir} rm -rf %{buildroot}%{_bindir}
rm -rf %{buildroot}%{_libdir}
rm -rf %{buildroot}%{_libexecdir} rm -rf %{buildroot}%{_libexecdir}
rm -rf %{buildroot}%{_datadir}/systemtap rm -rf %{buildroot}%{_datadir}/systemtap
rm -rf %{buildroot}%{_includedir} rm -rf %{buildroot}%{_includedir}

View File

@ -1,7 +1,7 @@
# #
# spec file for package systemtap # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed