From 9a42b883eccfe24ecbea5925465fcaff5a33a5b8 Mon Sep 17 00:00:00 2001 From: "Ziqian SUN(Zamir)" Date: Fri, 15 Apr 2022 17:17:55 +0800 Subject: [PATCH] Update to 3.0.3 Signed-off-by: Ziqian SUN(Zamir) --- .gitignore | 1 + sources | 2 +- trace-cmd.spec | 57 ++++++++++++++++---------------------------------- 3 files changed, 20 insertions(+), 40 deletions(-) diff --git a/.gitignore b/.gitignore index 2f2d543..0ef4ca1 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /trace-cmd-v2.9.1.tar.gz /trace-cmd-v2.9.2.tar.gz /trace-cmd-v2.9.7.tar.gz +/trace-cmd-v3.0.3.tar.gz diff --git a/sources b/sources index a1ddbb1..da31ada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (trace-cmd-v2.9.7.tar.gz) = f678ea380c0fe7e4ea9ed43d9024e418376fdf435043937e680d65a3728b9eefda2e6dcff0e02846267485317f764e7f7123812f5d5df5b63761a169f57520b9 +SHA512 (trace-cmd-v3.0.3.tar.gz) = 896a5b2d230eb0ee19e27bb71e485acd163a3225062015a0dae5b4b55eb48d8d1cdc034f7881751523384f13e20adfd8b7bc0a53392fff8029bf1403445cc785 diff --git a/trace-cmd.spec b/trace-cmd.spec index 1ed46b3..7f47599 100644 --- a/trace-cmd.spec +++ b/trace-cmd.spec @@ -2,19 +2,19 @@ #%%global git_commit trace-cmd-v2.6.2 #%%global git_commit 57371aaa2f469d0ba15fd85276deca7bfdd7ce36 -%global srcversion 2.9.7 +%global srcversion 3.0.3 Name: trace-cmd Version: %{srcversion} -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2 and LGPLv2 Summary: A user interface to Ftrace Requires: libtracecmd Requires: libtracefs Requires: libtraceevent -# Exclude i686 due to build failure -# https://bugzilla.redhat.com/show_bug.cgi?id=2055949 -ExcludeArch: %{ix86} + +ExcludeArch: %{ix86} %{arm} + 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 @@ -37,12 +37,14 @@ BuildRequires: cmake BuildRequires: qt5-qtbase-devel BuildRequires: freeglut-devel BuildRequires: json-c-devel -BuildRequires: libtraceevent-devel -BuildRequires: libtracefs-devel +BuildRequires: libtraceevent-devel >= 1.5.3 +BuildRequires: libtracefs-devel >= 1.3.1 BuildRequires: audit-libs-devel BuildRequires: chrpath BuildRequires: swig BuildRequires: systemd-rpm-macros +BuildRequires: libtracecmd-devel +BuildRequires: libzstd-devel %description trace-cmd is a user interface to Ftrace. Instead of needing to use the @@ -57,21 +59,6 @@ BuildRequires: python3-devel %description python3 Python plugin support for trace-cmd -%package -n libtracecmd -Summary: Libraries of trace-cmd -Version: 0 - -%description -n libtracecmd -The libtracecmd library - -%package -n libtracecmd-devel -Summary: Development files for libtracecmd -Version: 0 -Requires: libtracecmd%{_isa} = %{version}-%{release} - -%description -n libtracecmd-devel -Development files of the libtracecmd library - %prep %autosetup -n %{name}-v%{srcversion} cp %{SOURCE1} . @@ -80,20 +67,18 @@ cp %{SOURCE3} . %build # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate -# -z muldefs to workaround the enforcing multi definition check of gcc10. -# and it need to be removed once upstream fixed the variable name 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_cmd doc libtracecmd.so + PYTHON_VERS=python3 all_cmd doc for i in python/*.py ; do sed -i 's/env python2/python3/g' $i done chrpath --delete tracecmd/trace-cmd %install -make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/ CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs " BUILD_TYPE=Release install install_doc install_python install_libs +make libdir=%{_libdir} prefix=%{_prefix} V=1 DESTDIR=%{buildroot}/ CFLAGS="%{optflags} -D_GNU_SOURCE" LDFLAGS="%{build_ldflags} -z muldefs " BUILD_TYPE=Release install install_doc install_python 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 @@ -103,6 +88,8 @@ mkdir -p -m755 %{buildroot}/%{_udevrulesdir}/ install -p -m 644 trace-cmd.conf %{buildroot}/%{_sysconfdir}/sysconfig/ install -p -m 644 trace-cmd.service %{buildroot}/%{_unitdir}/ install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/ +rm -rf %{buildroot}/%{_docdir}/libtracecmd-doc +rm -rf %{buildroot}/%{_mandir}/man3/libtracecmd* %preun %systemd_preun %{name}.service @@ -112,29 +99,21 @@ install -p -m 644 98-trace-cmd.rules %{buildroot}/%{_udevrulesdir}/ %{_bindir}/trace-cmd %{_mandir}/man1/%{name}* %{_mandir}/man5/%{name}* +%{_docdir}/trace-cmd/trace-cmd*.html %{_sysconfdir}/bash_completion.d/trace-cmd.bash %{_sysconfdir}/sysconfig/trace-cmd.conf %{_unitdir}/trace-cmd.service %{_udevrulesdir}/98-trace-cmd.rules +%{_mandir}/man3/tracecmd* %files python3 %doc Documentation/README.PythonPlugin %{_libdir}/%{name}/python/ -%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 -n libtracecmd-devel -%{_libdir}/pkgconfig/libtracecmd.pc -%{_libdir}/libtracecmd.so -%{_includedir}/trace-cmd - %changelog +* Wed Apr 13 2022 Zamir SUN - 3.0.3 +- Update to 3.0.3 + * Fri Mar 18 2022 KUDOH Takashi - 2.9.7-2 - Add flight recoder service