diff --git a/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch b/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch new file mode 100644 index 0000000..c476e59 --- /dev/null +++ b/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch @@ -0,0 +1,27 @@ +From be4884c74355e0b84552e95a5ea2a4a808693acb Mon Sep 17 00:00:00 2001 +From: Zamir SUN +Date: Mon, 12 Oct 2020 21:05:29 +0800 +Subject: [PATCH] trace-cmd: Temporary move libtraceevent back to + %{_libdir}/trace-cmd + +Signed-off-by: Zamir SUN +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index b034042..fc0de09 100644 +--- a/Makefile ++++ b/Makefile +@@ -68,7 +68,7 @@ plugin_tracecmd_dir = $(libdir)/trace-cmd/plugins + python_dir ?= $(libdir)/traceevent/python + var_dir = $(HOME)/.trace-cmd/ + else +-plugin_traceevent_dir = $(libdir)/traceevent/plugins ++plugin_traceevent_dir = $(libdir)/trace-cmd/plugins + python_dir ?= $(libdir)/trace-cmd/python + PLUGIN_DIR_TRACEEVENT = -DPLUGIN_TRACEEVENT_DIR="$(plugin_traceevent_dir)" + PLUGIN_DIR_TRACECMD = -DPLUGIN_TRACECMD_DIR="$(plugin_tracecmd_dir)" +-- +2.26.2 + diff --git a/trace-cmd.spec b/trace-cmd.spec index 7c7ec12..64b68cb 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -4,7 +4,8 @@ Name: trace-cmd Version: 2.9.1 -Release: 2%{?dist} +# Note: After libtraceevent separated, remember to bump release to more than 20 to force a kernelshark update +Release: 3%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: trace-cmd-libs%{_isa} = %{version}-%{release} @@ -15,6 +16,7 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary # cd trace-cmd # git archive --prefix=trace-cmd-%%{version}/ -o trace-cmd-v%%{version}.tar.gz %%{git_commit} Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v%{version}.tar.gz +Patch0: 0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc @@ -57,6 +59,7 @@ Development headers of trace-cmd-libs %prep %setup -q -n %{name}-v%{version} +%patch0 -p1 %build # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate @@ -106,6 +109,9 @@ mv %{buildroot}/usr/etc/bash_completion.d %{buildroot}/%{_sysconfdir}/bash_compl %{_includedir}/tracefs %changelog +* Mon Oct 12 2020 Zamir SUN - 2.9.1-3 +- Temporary move libtraceevent back to trace-cmd/plugins to mitigate the conflicts + * Tue Sep 29 2020 Zamir SUN - 2.9.1-2 - Remove kernelsharl as it's now separate package