diff --git a/systemtap-docs.spec b/systemtap-docs.spec index a0f0e30..3f14619 100644 --- a/systemtap-docs.spec +++ b/systemtap-docs.spec @@ -22,7 +22,7 @@ Release: 0 Summary: Documents and examples for systemtap License: GPL-2.0-or-later Group: Development/Tools/Debuggers -Url: https://sourceware.org/systemtap/ +URL: https://sourceware.org/systemtap/ Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc Source2: systemtap.keyring diff --git a/systemtap-dtrace.changes b/systemtap-dtrace.changes new file mode 100644 index 0000000..ee10ff9 --- /dev/null +++ b/systemtap-dtrace.changes @@ -0,0 +1,5 @@ +------------------------------------------------------------------- +Fri Sep 27 15:07:24 UTC 2019 - Michael Gorse + +- Moved the dtrace binary into a separate package to resolve build + cycle with glib2 (bsc#1145438). diff --git a/systemtap-dtrace.spec b/systemtap-dtrace.spec new file mode 100644 index 0000000..3fc843a --- /dev/null +++ b/systemtap-dtrace.spec @@ -0,0 +1,57 @@ +# +# spec file for package systemtap-dtrace +# +# Copyright (c) 2019 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 +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + +# Please submit bugfixes or comments via https://bugs.opensuse.org/ +# + + +%if ! %{defined _rundir} +%define _rundir %{_localstatedir}/run +%endif +Name: systemtap-dtrace +Version: 4.1 +Release: 0 +Summary: SystemTap dtrace utility +License: GPL-2.0-or-later +Group: Development/Tools/Debuggers +URL: http://sourceware.org/systemtap/ +Source0: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz +Source1: http://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc +Source2: systemtap.keyring +Source3: README-BEFORE-ADDING-PATCHES +Source4: README-KEYRING +BuildArch: noarch + +%description +SystemTap is an instrumentation system for systems running Linux. +This package contains the dtrace utility to build provider and probe +definitions. + +%prep +%setup -q -n systemtap-%{version} + +%build +# Our binutils always support '?' in the section characters on all +# architectures, no need for configure tests +sed s=@preferred_python@=%{_bindir}/python3= dtrace.in |sed s=@prefix@=%{_prefix}= >dtrace + +%install +mkdir -p %{buildroot}%{_bindir} +install -m 755 dtrace %{buildroot}%{_bindir} + +%files +%defattr(-,root,root) +%{_bindir}/dtrace + +%changelog diff --git a/systemtap-headers.spec b/systemtap-headers.spec index 57bada5..4f8c42a 100644 --- a/systemtap-headers.spec +++ b/systemtap-headers.spec @@ -29,7 +29,7 @@ Release: 0 Summary: SystemTap headers License: GPL-2.0-or-later Group: Development/Tools/Debuggers -Url: http://sourceware.org/systemtap/ +URL: http://sourceware.org/systemtap/ Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc Source2: systemtap.keyring diff --git a/systemtap.changes b/systemtap.changes index 7d7db8c..4836b0a 100644 --- a/systemtap.changes +++ b/systemtap.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Mon Oct 14 07:32:43 UTC 2019 - Martin Pluskal + +- Do not require exact version of systemtap-dtrace as build + counters are not same for different packages + +------------------------------------------------------------------- +Mon Sep 30 14:07:44 UTC 2019 - Michael Gorse + +- Moved the dtrace binary into a separate package to resolve build + cycle with glib2 (bsc#1145438). + ------------------------------------------------------------------- Fri Aug 9 20:06:57 UTC 2019 - Tony Jones diff --git a/systemtap.spec b/systemtap.spec index 27d36ed..9f6f96c 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -25,7 +25,7 @@ Release: 0 Summary: Instrumentation System License: GPL-2.0-or-later Group: Development/Tools/Debuggers -Url: https://sourceware.org/systemtap/ +URL: https://sourceware.org/systemtap/ Source0: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz Source1: https://sourceware.org/systemtap/ftp/releases/systemtap-%{version}.tar.gz.asc Source2: %{name}.keyring @@ -46,6 +46,7 @@ BuildRequires: pkgconfig BuildRequires: python3-base BuildRequires: sqlite-devel BuildRequires: pkgconfig(systemd) +Requires: %{name}-dtrace = %{version} Requires: %{name}-runtime = %{version}-%{release} Requires: libebl1 Obsoletes: systemtap-client < 1.5 @@ -105,6 +106,7 @@ make %{?_smp_mflags} V=1 %install %make_install +rm -f %{buildroot}%{_bindir}/dtrace rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request # README, AUTHORS, NEWS, man3 and all examples packaged by systemtap-docs # COPYING needs to stay in main for GPL @@ -174,6 +176,5 @@ install -m 644 %{SOURCE5} %{buildroot}%{_libexecdir}/tmpfiles.d %files sdt-devel %defattr(-,root,root) %{_includedir}/sys/*.h -%{_bindir}/dtrace %changelog