From dfd620c20fd413032f5a5a6d5a7e59241c090c88 Mon Sep 17 00:00:00 2001
From: Zamir SUN <sztsian@gmail.com>
Date: May 23 2017 14:03:16 +0000
Subject: Rebase to 2.6.1.


---

diff --git a/.gitignore b/.gitignore
index 37cb892..fdbb818 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /trace-cmd-2.1.0.tar.gz
 /trace-cmd-2.2.1.tar.gz
 /trace-cmd-2.6.tar.gz
+/trace-cmd-2.6.1.tar.gz
diff --git a/sources b/sources
index 12d3d63..35ce0b5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (trace-cmd-2.6.tar.gz) = dc621d211b84c1d00b99954901d0c71ebe96bc4c825b0b0dde537f282529bf097ada5d089ebe7d702ab945747ef113155c27e8c10cb1428bed932da200f45934
+SHA512 (trace-cmd-2.6.1.tar.gz) = 741281c8dc9355218932c6edc6b585de92ffc2b530744d13b4eb838ead8d2c6ec91fd25f39e590b50223c3425ae1cf2ec949f269335fc9d2b0cf1c4999751ec4
diff --git a/trace-cmd-2.6-libdir.patch b/trace-cmd-2.6-libdir.patch
index cd930ba..79b8f1b 100644
--- a/trace-cmd-2.6-libdir.patch
+++ b/trace-cmd-2.6-libdir.patch
@@ -7,8 +7,8 @@ diff -up ./Makefile.orig ./Makefile
  
 +# figure out what arch we are on and install to the right place
 +ARCH = $(shell getconf LONG_BIT)
-+LIBDIR_32 = lib
-+LIBDIR_64 = lib64
++LIBDIR_32 = /usr/lib
++LIBDIR_64 = /usr/lib64
 +libdir=$(LIBDIR_$(ARCH))
 +
 +
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 332f42c..c0d4d53 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -1,11 +1,11 @@
 #%global checkout 20170330git013205a8
 # git tag
 #%global git_commit trace-cmd-v2.6
-%global git_commit 013205a8f9e60998b39c106470957030585b5851
+%global git_commit 021710e1073fe203341b427cd1a4bac577ec899c
 
 Name: trace-cmd
-Version: 2.6
-Release: 4.20170330git013205%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Summary: A user interface to Ftrace
 
@@ -19,7 +19,6 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
 Source0: trace-cmd-%{version}.tar.gz
 Source1: kernelshark.desktop
 Patch1: trace-cmd-2.6-libdir.patch
-Patch2: bz1389219-segmentation-fault-in-trace-snapshot.patch
 BuildRequires: xmlto
 BuildRequires: asciidoc
 BuildRequires: mlocate
@@ -46,7 +45,6 @@ Kernelshark is the GUI frontend for analyzing data produced by
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
-%patch2 -p1
 
 %build
 # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
@@ -80,6 +78,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 
 
 %changelog
+* Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6.1-1
+- Rebase to 2.6.1.
+
 * Thu Mar 30 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4.20170330git013205
 - Rebase to newest upstream version to include various bug fixes.