From e4016d08445e17c7d7835a38b9c56b77307298f4e47a2914b3c2c5aa43169078 Mon Sep 17 00:00:00 2001 From: Alexei Sorokin Date: Fri, 19 Jan 2018 12:15:37 +0000 Subject: [PATCH] Accepting request 567669 from openSUSE:Factory:Staging:O - Format with spec-cleaner - Drop tex/asciidoc/xmlto dependencies as the manpages are already generated in the tarball so we produce the same result and this way we are not pulling in python2 OBS-URL: https://build.opensuse.org/request/show/567669 OBS-URL: https://build.opensuse.org/package/show/devel:tools:lttng/lttng-ust?expand=0&rev=27 --- lttng-ust.changes | 8 ++++++++ lttng-ust.spec | 17 +++++++---------- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/lttng-ust.changes b/lttng-ust.changes index 7dccde9..3f2ee91 100644 --- a/lttng-ust.changes +++ b/lttng-ust.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Fri Jan 19 11:50:18 UTC 2018 - tchvatal@suse.com + +- Format with spec-cleaner +- Drop tex/asciidoc/xmlto dependencies as the manpages are already + generated in the tarball so we produce the same result and this + way we are not pulling in python2 + ------------------------------------------------------------------- Fri Dec 29 18:52:22 UTC 2017 - sor.alexei@meowr.ru diff --git a/lttng-ust.spec b/lttng-ust.spec index f24555f..f8bbba6 100644 --- a/lttng-ust.spec +++ b/lttng-ust.spec @@ -1,7 +1,7 @@ # # spec file for package lttng-ust # -# 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 @@ -30,15 +30,11 @@ Source1: https://lttng.org/files/lttng-ust/lttng-ust-%{version}.tar.bz2.a Source2: %{name}.keyring # PATCH-FIX-OPENSUSE lttng-ust-copying.patch Patch0: lttng-ust-copying.patch -BuildRequires: asciidoc BuildRequires: gcc-c++ BuildRequires: liburcu-devel BuildRequires: pkgconfig -BuildRequires: python -BuildRequires: texinfo -BuildRequires: xmlto BuildRequires: pkgconfig(uuid) -ExclusiveArch: %ix86 x86_64 aarch64 ppc64 ppc64le +ExclusiveArch: %{ix86} x86_64 aarch64 ppc64 ppc64le %description This library may be used by user space applications to generate @@ -90,12 +86,16 @@ applications using LTTng userspace tracing. %setup -q %patch0 -p1 +# Fix env shebang +sed -i -e "1s|^#!.*$|#!%{_bindir}/python3|" tools/lttng-gen-tp + %build %configure \ + --disable-silent-rules \ --docdir=%{_docdir}/%{name} \ --disable-static \ --disable-maintainer-mode -make %{?_smp_mflags} V=1 +make %{?_smp_mflags} %install %make_install @@ -103,11 +103,8 @@ find %{buildroot} -type f -name "*.la" -delete -print rm -rf %{buildroot}/tmp/lttng-ust-divert %post -n liblttng-ust%{sover} -p /sbin/ldconfig - %postun -nliblttng-ust%{sover} -p /sbin/ldconfig - %post -n liblttng-ust-ctl%{sover_ctl} -p /sbin/ldconfig - %postun -nliblttng-ust-ctl%{sover_ctl} -p /sbin/ldconfig %files -n liblttng-ust%{sover}