testing/systemtap
SHA256
3
0
Fork 0
forked from pool/systemtap
Code Pull Requests Activity

Accepting request 578031 from home:matz2:branches:devel:tools

Browse Source 
- Add Conflicts with systemtap-sdt-devel, as that one again
  provides the headers as well.

- Care for pecularities of build counter syncs between different
  build rings: the Requires from sdt-devel can't use %release
  for systemtap-headers, but we also don't want to just include
  %version, so separate both totally:
  * Add the include headers to sdt-devel again.
  * Add Conflicts with systemtap-headers to care for the resulting
    file conflicts.
  * Remove Require from sdt-devel to systemtap-headers again.

OBS-URL: https://build.opensuse.org/request/show/578031
OBS-URL: https://build.opensuse.org/package/show/devel:tools/systemtap?expand=0&rev=97
This commit is contained in:
Michael Matz 2018-02-20 12:53:55 +00:00 committed by Git OBS Bridge
parent 13a8210f16
commit 49da3875a7
4 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
systemtap-headers.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Feb 16 15:20:50 UTC 2018 - matz@suse.com
- Add Conflicts with systemtap-sdt-devel, as that one again
provides the headers as well.
-------------------------------------------------------------------
Thu Feb 8 15:26:17 UTC 2018 - matz@suse.com

12
systemtap-headers.spec
View File

@ -16,6 +16,11 @@
#
# Note: this separate package systemtap-headers exists so that ring0
# packages can make use of the SDT headers without pulling in all
# build requirements of the normal systemtap package. Normal use
# outside of BuildRequires in ring0 packages should use systemtap-sdt-devel
%if ! %{defined _rundir}
%define _rundir %{_localstatedir}/run
%endif
@ -26,6 +31,9 @@ Summary: SystemTap headers
License: GPL-2.0+
Group: Development/Tools/Debuggers
Url: http://sourceware.org/systemtap/
# sdt-devel provides the same header files as us, so we
# must conflict
Conflicts: systemtap-sdt-devel
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
@ -38,7 +46,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
SystemTap is an instrumentation system for systems running Linux.
This package contains the headers for static system probes.
This package contains only the headers for static system probes and
exists only to limit build cycles. Normally you should install
systemtap-sdt-devel, which also contains these headers.
%prep
%setup -q -n systemtap-%{version}

12
systemtap.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Fri Feb 16 15:28:22 UTC 2018 - matz@suse.com
- Care for pecularities of build counter syncs between different
build rings: the Requires from sdt-devel can't use %release
for systemtap-headers, but we also don't want to just include
%version, so separate both totally:
* Add the include headers to sdt-devel again.
* Add Conflicts with systemtap-headers to care for the resulting
file conflicts.
* Remove Require from sdt-devel to systemtap-headers again.
-------------------------------------------------------------------
Thu Feb 8 15:28:32 UTC 2018 - matz@suse.com

7
systemtap.spec
View File

@ -84,8 +84,10 @@ This package contains the server component of systemtap.
%package sdt-devel
Summary: Static probe support tools
Group: Development/Tools/Debuggers
# systemtap-headers provides the same header files
# as sdt-devel, so we must conflict.
Conflicts: systemtap-headers
Requires: %{name} = %{version}-%{release}
Requires: %{name}-headers = %{version}-%{release}
%description sdt-devel
SystemTap is an instrumentation system for systems running Linux.
@ -112,8 +114,6 @@ rm -f %{buildroot}%{_libexecdir}/systemtap/stap-server-request
rm -rf %{buildroot}%{_docdir}/systemtap/
rm -rf %{buildroot}%{_datadir}/systemtap/examples
rm -rf %{buildroot}%{_mandir}/man3 %{buildroot}%{_mandir}/cs/man3
# the headers come from systemtap-headers, a separate .spec file
rm -rf %{buildroot}%{_includedir}/sys
mkdir -p %{buildroot}%{_docdir}/systemtap/
cp COPYING %{buildroot}%{_docdir}/systemtap/
mkdir -p %{buildroot}%{_localstatedir}/cache/systemtap
@ -176,6 +176,7 @@ systemd-tmpfiles --create %{_libexecdir}/tmpfiles.d/stap-server.conf
%files sdt-devel
%defattr(-,root,root)
%{_includedir}/sys/*.h
%{_bindir}/dtrace
%changelog