From ce1df33cb94b7b91e39d9750326e4865d06d87f9 Mon Sep 17 00:00:00 2001
From: Zamir SUN <sztsian@gmail.com>
Date: Tue, 23 May 2017 22:30:18 +0800
Subject: [PATCH] Rebase to 2.6.1

---
 .gitignore                                          |  1 +
 bz1386451-trace-cmd-record-crash-f-before-e.patch   | 13 -------------
 ...89219-segmentation-fault-in-trace-snapshot.patch | 13 -------------
 sources                                             |  3 +--
 trace-cmd-2.6-libdir.patch                          |  4 ++--
 trace-cmd.spec                                      | 13 ++++++-------
 6 files changed, 10 insertions(+), 37 deletions(-)
 delete mode 100644 bz1386451-trace-cmd-record-crash-f-before-e.patch
 delete mode 100644 bz1389219-segmentation-fault-in-trace-snapshot.patch

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/bz1386451-trace-cmd-record-crash-f-before-e.patch b/bz1386451-trace-cmd-record-crash-f-before-e.patch
deleted file mode 100644
index ec972ea..0000000
--- a/bz1386451-trace-cmd-record-crash-f-before-e.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/trace-record.c b/trace-record.c
-index a8d32d3..ab64418 100644
---- a/trace-record.c
-+++ b/trace-record.c
-@@ -3803,7 +3803,7 @@ void trace_record (int argc, char **argv)
- 	const char *output = NULL;
- 	const char *option;
- 	struct event_list *event = NULL;
--	struct event_list *last_event;
-+	struct event_list *last_event = NULL;
- 	struct buffer_instance *instance = &top_instance;
- 	enum trace_type type = 0;
- 	char *pids;
diff --git a/bz1389219-segmentation-fault-in-trace-snapshot.patch b/bz1389219-segmentation-fault-in-trace-snapshot.patch
deleted file mode 100644
index 68661ec..0000000
--- a/bz1389219-segmentation-fault-in-trace-snapshot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/trace-snapshot.c b/trace-snapshot.c
-index 9d3608c..f1036f6 100644
---- a/trace-snapshot.c
-+++ b/trace-snapshot.c
-@@ -42,7 +42,7 @@ static void write_file(const char *name, char *val)
- 
- 	n = write(fd, val, strlen(val));
- 	if (n < 0)
--		die("failed to write '%d' to %s\n", path);
-+		die("failed to write to %s\n", path);
- 	tracecmd_put_tracing_file(path);
- 	close(fd);
- }
diff --git a/sources b/sources
index ae9bdc8..35ce0b5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-19d5516fe013127e5f26c1aecf2eddd0  trace-cmd-2.2.1.tar.gz
-fb5148dc8ba05b2d30a24d801ae92eeb  trace-cmd-2.6.tar.gz
+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 574b700..9006bdc 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -3,8 +3,8 @@
 %global git_commit trace-cmd-v2.6
 
 Name: trace-cmd
-Version: 2.6
-Release: 4%{?dist}
+Version: 2.6.1
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Summary: A user interface to Ftrace
 
@@ -18,8 +18,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: bz1386451-trace-cmd-record-crash-f-before-e.patch
-Patch3: bz1389219-segmentation-fault-in-trace-snapshot.patch
 
 BuildRequires: xmlto
 BuildRequires: asciidoc
@@ -47,8 +45,6 @@ Kernelshark is the GUI frontend for analyzing data produced by
 %prep
 %setup -q -n %{name}-%{version}
 %patch1 -p1
-%patch2 -p1
-%patch3 -p1
 
 %build
 # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
@@ -78,9 +74,12 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 %{_bindir}/kernelshark
 %{_datadir}/kernelshark
 %{_datadir}/applications/kernelshark.desktop
-
+%{_sysconfdir}/bash_completion.d/trace-cmd.bash
 
 %changelog
+* Tue May 23 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6.1-1
+- Rebase to 2.6.1
+
 * Mon Mar 27 2017 Zamir SUN <zsun@fedoraproject.org> - 2.6-4
 - Fix bz1389219 segmentation fault in trace-cmd snapshot