From 4440f918078ea9a31508c3db414f11d97641ba40 Mon Sep 17 00:00:00 2001
From: Jon Stanley <jonstanley@gmail.com>
Date: Aug 18 2016 04:39:34 +0000
Subject: Update to upstream 2.6


---

diff --git a/.gitignore b/.gitignore
index e2e4811..37cb892 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 /trace-cmd-1.2.20120606git8266dff.tar.gz
 /trace-cmd-2.1.0.tar.gz
 /trace-cmd-2.2.1.tar.gz
+/trace-cmd-2.6.tar.gz
diff --git a/sources b/sources
index 03eacab..f126397 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 19d5516fe013127e5f26c1aecf2eddd0  trace-cmd-2.2.1.tar.gz
+ae703bbfa2459f01874f3b2e26a26651  trace-cmd-2.6.tar.gz
diff --git a/trace-cmd-2.6-libdir.patch b/trace-cmd-2.6-libdir.patch
new file mode 100644
index 0000000..cd930ba
--- /dev/null
+++ b/trace-cmd-2.6-libdir.patch
@@ -0,0 +1,17 @@
+diff -up ./Makefile.orig ./Makefile
+--- ./Makefile.orig	2016-08-18 00:26:57.580940826 -0400
++++ ./Makefile	2016-08-18 00:29:51.594273746 -0400
+@@ -31,6 +31,13 @@ $(call allow-override,AR,$(CROSS_COMPILE
+ EXT = -std=gnu99
+ INSTALL = install
+ 
++# 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=$(LIBDIR_$(ARCH))
++
++
+ # Use DESTDIR for installing into a different root directory.
+ # This is useful for building a package. The program will be
+ # installed in this directory as if it was the root directory.
diff --git a/trace-cmd.spec b/trace-cmd.spec
index 40abb88..b960458 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -3,8 +3,8 @@
 %global git_commit trace-cmd-v2.2.1
 
 Name: trace-cmd
-Version: 2.2.1
-Release: 7%{?dist}
+Version: 2.6
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Summary: A user interface to Ftrace
 
@@ -17,7 +17,7 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
 # git archive --prefix=trace-cmd-%%{version}/ -o trace-cmd-%%{version}.tar.gz %%{git_commit}
 Source0: trace-cmd-%{version}.tar.gz
 Source1: kernelshark.desktop
-Patch1: trace-cmd-2.1.0-plugin-dir.patch
+Patch1: trace-cmd-2.6-libdir.patch
 
 BuildRequires: xmlto
 BuildRequires: asciidoc
@@ -76,6 +76,11 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 
 
 %changelog
+* Thu Aug 18 2016 Jon Stanley <jonstanley@gmail.com> - 2.6-1
+- Upgrade to uptream 2.6
+- Rebase distro patch
+- Resolves: rhbz#1365951
+
 * Fri Feb 05 2016 Fedora Release Engineering <releng@fedoraproject.org> - 2.2.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild