diff --git a/.gitignore b/.gitignore index 54281d9..7712876 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /trace-cmd-v2.7.tar.gz /trace-cmd-v2.8.3.tar.gz /trace-cmd-v2.9.1.tar.gz +/trace-cmd-v2.9.2.tar.gz diff --git a/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch b/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch deleted file mode 100644 index c476e59..0000000 --- a/0001-trace-cmd-Temporary-move-libtraceevent-back-to-_libd.patch +++ /dev/null @@ -1,27 +0,0 @@ -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/sources b/sources index b7957ec..795af90 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v2.9.1.tar.gz) = 186bfdd8ff1e88e9e6d3ae87b123f049892deaaa8d6a42944b6f8abee6b828946b88774029aa96daf4423a3dfc01b42835508f44f636dd02579ef9a8ef425131 +SHA512 (trace-cmd-v2.9.2.tar.gz) = ddb32446a5185ee6414f297de1d48fe39a7141c833a608fd3977dd0efd496bf18b59ea5d064316e7deb86c1cd82f33dcea4c0c145bb31b2473e85593f4d0d461 diff --git a/trace-cmd.spec b/trace-cmd.spec index 0c4f02b..1010148 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,23 +2,25 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 +%global srcversion 2.9.2 + Name: trace-cmd -Version: 2.9.1 -# Note: After libtraceevent separated, remember to bump release to more than 20 to force a kernelshark update -Release: 5%{?dist} +Version: %{srcversion} +Release: 2%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace -Requires: trace-cmd-libs%{_isa} = %{version}-%{release} +Requires: libtracecmd +Requires: libtracefs +Requires: libtraceevent URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary # If upstream does not provide tarballs, to generate: # git clone https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git # 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 +Source0: https://git.kernel.org/pub/scm/utils/trace-cmd/trace-cmd.git/snapshot/trace-cmd-v%{srcversion}.tar.gz BuildRequires: make -BuildRequires: gcc +BuildRequires: gcc BuildRequires: xmlto BuildRequires: asciidoc BuildRequires: mlocate @@ -30,6 +32,7 @@ BuildRequires: cmake BuildRequires: qt5-qtbase-devel BuildRequires: freeglut-devel BuildRequires: json-c-devel +BuildRequires: libtraceevent-devel %description trace-cmd is a user interface to Ftrace. Instead of needing to use the @@ -45,22 +48,23 @@ BuildRequires: python3-devel %description python3 Python plugin support for trace-cmd -%package libs +%package -n libtracecmd Summary: Libraries of trace-cmd +Version: 0 -%description libs -Libraries of trace-cmd +%description -n libtracecmd +The libtracecmd library -%package devel -Summary: Development headers of trace-cmd-libs -Requires: trace-cmd-libs%{_isa} = %{version}-%{release} +%package -n libtracecmd-devel +Summary: Development files for libtracecmd +Version: 0 +Requires: libtracecmd%{_isa} = %{version}-%{release} -%description devel -Development headers of trace-cmd-libs +%description -n libtracecmd-devel +Development files of the libtracecmd library %prep -%setup -q -n %{name}-v%{version} -%patch0 -p1 +%autosetup -n %{name}-v%{srcversion} %build # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate @@ -70,7 +74,7 @@ MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl` CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags}" BUILD_TYPE=Release \ make V=9999999999 MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL \ prefix=%{_prefix} libdir=%{_libdir} \ - PYTHON_VERS=python3 all doc plugins libs + PYTHON_VERS=python3 all_cmd doc libtracecmd.so for i in python/*.py ; do sed -i 's/env python2/python3/g' $i done @@ -80,10 +84,7 @@ make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/ CFLAGS="%{opt find %{buildroot}%{_mandir} -type f | xargs chmod u-x,g-x,o-x find %{buildroot}%{_datadir} -type f | xargs chmod u-x,g-x,o-x find %{buildroot}%{_libdir} -type f -iname "*.so" | xargs chmod 0755 -#sed -i '/Version/d' %{buildroot}/%{_datadir}/applications/kernelshark.desktop -#desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop mkdir -p %{buildroot}/%{_sysconfdir} -mv %{buildroot}/usr/etc/bash_completion.d %{buildroot}/%{_sysconfdir}/bash_completion.d %files %doc COPYING COPYING.LIB README @@ -96,22 +97,30 @@ mv %{buildroot}/usr/etc/bash_completion.d %{buildroot}/%{_sysconfdir}/bash_compl %doc Documentation/README.PythonPlugin %{_libdir}/%{name}/python/ -%files libs -%dir %{_libdir}/%{name} -%dir %{_libdir}/traceevent -%dir %{_libdir}/tracefs -%dir %{_libdir}/trace-cmd -%{_libdir}/trace-cmd/libtracecmd.so -%{_libdir}/trace-cmd/plugins -%{_libdir}/traceevent/ -%{_libdir}/tracefs/ +%files -n libtracecmd +%doc COPYING COPYING.LIB README +%{_libdir}/libtracecmd.so.0 +%{_libdir}/libtracecmd.so.0.0.1 +%{_docdir}/libtracecmd-doc +%{_mandir}/man3/libtracecmd* +%{_mandir}/man3/tracecmd* -%files devel +%files -n libtracecmd-devel +%{_libdir}/pkgconfig/libtracecmd.pc +%{_libdir}/libtracecmd.so %{_includedir}/trace-cmd -%{_includedir}/traceevent -%{_includedir}/tracefs %changelog +* Mon Mar 29 2021 Zamir SUN - 2.9.2-2 +- Fix dependency of libtracecmd +- Resolves https://bugzilla.redhat.com/show_bug.cgi?id=1943919 + +* Fri Mar 26 2021 Zamir SUN - 2.9.2-1 +- Update to 2.9.2 + +* Wed Mar 24 2021 Jerome Marchand - 2.9.1-6 +- Build with external libtraceevent and libtracefs + * Wed Jan 27 2021 Fedora Release Engineering - 2.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild