Rebase to newest upstream version to include various bug fixes.

This commit is contained in:
Zamir SUN 2017-03-30 20:49:44 +08:00
parent e1b080ce33
commit 1418c1b573
2 changed files with 10 additions and 9 deletions

View File

@ -1,2 +1 @@
19d5516fe013127e5f26c1aecf2eddd0 trace-cmd-2.2.1.tar.gz SHA512 (trace-cmd-2.6.tar.gz) = dc621d211b84c1d00b99954901d0c71ebe96bc4c825b0b0dde537f282529bf097ada5d089ebe7d702ab945747ef113155c27e8c10cb1428bed932da200f45934
fb5148dc8ba05b2d30a24d801ae92eeb trace-cmd-2.6.tar.gz

View File

@ -1,10 +1,11 @@
#%global checkout 20130723git07f0eee2 #%global checkout 20170330git013205a8
# git tag # git tag
%global git_commit trace-cmd-v2.6 #%global git_commit trace-cmd-v2.6
%global git_commit 013205a8f9e60998b39c106470957030585b5851
Name: trace-cmd Name: trace-cmd
Version: 2.6 Version: 2.6
Release: 4%{?dist} Release: 4.20170330git013205%{?dist}
License: GPLv2 and LGPLv2 License: GPLv2 and LGPLv2
Summary: A user interface to Ftrace Summary: A user interface to Ftrace
@ -18,9 +19,7 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
Source0: trace-cmd-%{version}.tar.gz Source0: trace-cmd-%{version}.tar.gz
Source1: kernelshark.desktop Source1: kernelshark.desktop
Patch1: trace-cmd-2.6-libdir.patch Patch1: trace-cmd-2.6-libdir.patch
Patch2: bz1386451-trace-cmd-record-crash-f-before-e.patch Patch2: bz1389219-segmentation-fault-in-trace-snapshot.patch
Patch3: bz1389219-segmentation-fault-in-trace-snapshot.patch
BuildRequires: xmlto BuildRequires: xmlto
BuildRequires: asciidoc BuildRequires: asciidoc
BuildRequires: mlocate BuildRequires: mlocate
@ -48,7 +47,6 @@ Kernelshark is the GUI frontend for analyzing data produced by
%setup -q -n %{name}-%{version} %setup -q -n %{name}-%{version}
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1
%build %build
# MANPAGE_DOCBOOK_XSL define is hack to avoid using locate # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
@ -78,9 +76,13 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
%{_bindir}/kernelshark %{_bindir}/kernelshark
%{_datadir}/kernelshark %{_datadir}/kernelshark
%{_datadir}/applications/kernelshark.desktop %{_datadir}/applications/kernelshark.desktop
%{_sysconfdir}/bash_completion.d/trace-cmd.bash
%changelog %changelog
* Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4.20170330git013205
- Rebase to newest upstream version to include various bug fixes.
* Mon Mar 27 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4 * Mon Mar 27 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4
- Fix bz1389219 segmentation fault in trace-cmd snapshot - Fix bz1389219 segmentation fault in trace-cmd snapshot