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

- 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

systemtap.spec

@@ -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