Hello community, here is the log from the commit of package systemtap for openSUSE:Factory checked in at 2018-02-25 12:19:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemtap (Old) and /work/SRC/openSUSE:Factory/.systemtap.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemtap" Sun Feb 25 12:19:23 2018 rev:99 rq:578343 version:3.2 Changes: -------- New Changes file: --- /dev/null 2018-02-08 01:06:41.103727112 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap-headers.changes 2018-02-25 12:19:46.601167788 +0100 @@ -0,0 +1,12 @@ +------------------------------------------------------------------- +Fri Feb 16 15:20:50 UTC 2018 - [email protected] + +- Add Conflicts with systemtap-sdt-devel, as that one again + provides the headers as well. + +------------------------------------------------------------------- +Thu Feb 8 15:26:17 UTC 2018 - [email protected] + +- Created new specfile systemtap-headers.spec, so bootstrap cycles + packages can use them without blowing up the cycle. + [fate#324969] --- /work/SRC/openSUSE:Factory/systemtap/systemtap.changes 2017-11-23 09:36:18.890245340 +0100 +++ /work/SRC/openSUSE:Factory/.systemtap.new/systemtap.changes 2018-02-25 12:19:46.693164457 +0100 @@ -1,0 +2,19 @@ +Fri Feb 16 15:28:22 UTC 2018 - [email protected] + +- 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 - [email protected] + +- Don't include the headers files in sdt-devel +- Add systemtap-headers to Requires of sdt-devel, so that it + provides the same files as before. [fate#324969] + +------------------------------------------------------------------- New: ---- systemtap-headers.changes systemtap-headers.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemtap-headers.spec ++++++ # # spec file for package systemtap-headers # # 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 # 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 http://bugs.opensuse.org/ # # 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 Name: systemtap-headers Version: 3.2 Release: 0 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 Source3: README-BEFORE-ADDING-PATCHES Source4: README-KEYRING Source5: stap-server.conf Patch1: systemtap-build-source-dir.patch Patch2: systemtap-change-extra_cflags-escape-processing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description SystemTap is an instrumentation system for systems running Linux. 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} %patch1 -p1 %patch2 -p1 %build # Our binutils always support '?' in the section characters on all # architectures, no need for configure tests sed -e 's/@support_section_question@/1/' < includes/sys/sdt-config.h.in > includes/sys/sdt-config.h %install mkdir -p %{buildroot}%{_includedir}/sys cp -rp includes/sys/*.h %{buildroot}%{_includedir}/sys/ %files %defattr(-,root,root) %{_includedir}/sys/*.h %changelog ++++++ systemtap.spec ++++++ --- /var/tmp/diff_new_pack.CyYxXG/_old 2018-02-25 12:19:47.737126646 +0100 +++ /var/tmp/diff_new_pack.CyYxXG/_new 2018-02-25 12:19:47.741126501 +0100 @@ -84,6 +84,9 @@ %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} %description sdt-devel @@ -173,7 +176,7 @@ %files sdt-devel %defattr(-,root,root) -%{_bindir}/dtrace %{_includedir}/sys/*.h +%{_bindir}/dtrace %changelog
