[trace-cmd] Update to latest upstream release

[Jon Stanley]

commit 6e56e74a7c73be0d12e21c0bf2f891ff6ed23656
Author: Jon Stanley <jonstanley at gmail.com>
Date:   Wed Feb 13 17:57:14 2013 -0500

    Update to latest upstream release

 .gitignore                       |    1 +
 sources                          |    2 +-
 trace-cmd-1.2-plugin-dir.patch   |   24 ------------------------
 trace-cmd-2.1.0-plugin-dir.patch |   25 +++++++++++++++++++++++++
 trace-cmd.spec                   |   22 +++++++++++++---------
 5 files changed, 40 insertions(+), 34 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 19c87a7..5c3961f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /trace-cmd-1.2.20120606git8266dff.tar.gz
+/trace-cmd-2.1.0.tar.gz
diff --git a/sources b/sources
index 2203659..a3184fe 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21612c27a2274094269ed37e95a8341c  trace-cmd-1.2.20120606git8266dff.tar.gz
+c839258271dbcd3e821f521fcf6674ed  trace-cmd-2.1.0.tar.gz
diff --git a/trace-cmd-2.1.0-plugin-dir.patch b/trace-cmd-2.1.0-plugin-dir.patch
new file mode 100644
index 0000000..f1d784f
--- /dev/null
+++ b/trace-cmd-2.1.0-plugin-dir.patch
@@ -0,0 +1,25 @@
+diff -up trace-cmd-2.1.0/Makefile.orig trace-cmd-2.1.0/Makefile
+--- trace-cmd-2.1.0/Makefile.orig	2013-02-13 10:50:10.355656277 -0500
++++ trace-cmd-2.1.0/Makefile	2013-02-13 10:51:37.409584197 -0500
+@@ -31,6 +31,12 @@ $(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.
+@@ -56,7 +62,7 @@ ifeq ($(prefix),$(HOME))
+ plugin_dir = $(HOME)/.trace-cmd/plugins
+ python_dir = $(HOME)/.trace-cmd/python
+ else
+-plugin_dir = $(prefix)/lib/trace-cmd/plugins
++plugin_dir = $(prefix)/$(LIBDIR)/trace-cmd
+ python_dir = $(prefix)/lib/trace-cmd/python
+ PLUGIN_DIR = -DPLUGIN_DIR="$(plugin_dir)"
+ PYTHON_DIR = -DPYTHON_DIR="$(python_dir)"
diff --git a/trace-cmd.spec b/trace-cmd.spec
index c5be893..1645483 100644
--- a/trace-cmd.spec
+++ b/trace-cmd.spec
@@ -1,9 +1,10 @@
-%global checkout 20120606git8266dff
-%global git_commit 8266dff
+#%global checkout 20120606git8266dff
+# git tag
+%global git_commit trace-cmd-v2.1.0
 
 Name: trace-cmd
-Version: 1.2
-Release: 4.%{checkout}%{?dist}
+Version: 2.1.0
+Release: 1%{?dist}
 License: GPLv2 and LGPLv2
 Summary: A user interface to Ftrace
 
@@ -13,10 +14,10 @@ URL: http://git.kernel.org/?p=linux/kernel/git/rostedt/trace-cmd.git;a=summary
 # To generate:
 # git clone git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/trace-cmd.git
 # cd trace-cmd
-# git archive --prefix=trace-cmd-%%{version}.%%{checkout}/ -o trace-cmd-%%{version}.%%{checkout}.tar.gz %%{git_commit}
-Source0: trace-cmd-%{version}.%{checkout}.tar.gz
+# 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-1.2-plugin-dir.patch
+Patch1: trace-cmd-2.1.0-plugin-dir.patch
 
 BuildRequires: xmlto
 BuildRequires: asciidoc
@@ -42,13 +43,13 @@ Kernelshark is the GUI frontend for analyzing data produced by
 'trace-cmd extract'
 
 %prep
-%setup -q -n %{name}-%{version}.%{checkout}
+%setup -q -n %{name}-%{version}
 %patch1 -p1
 
 %build
 # MANPAGE_DOCBOOK_XSL define is hack to avoid using locate
 MANPAGE_DOCBOOK_XSL=`rpm -ql docbook-style-xsl | grep manpages/docbook.xsl`
-make V=1 CFLAGS="%{optflags}" MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL prefix=%{_prefix} all doc gui
+make V=1 CFLAGS="%{optflags} -D_GNU_SOURCE" MANPAGE_DOCBOOK_XSL=$MANPAGE_DOCBOOK_XSL prefix=%{_prefix} all doc gui
 
 
 %install
@@ -75,6 +76,9 @@ desktop-file-validate %{buildroot}/%{_datadir}/applications/kernelshark.desktop
 
 
 %changelog
+* Wed Feb 13 2013 Jon Stanley <jonstanley at gmail.com> - 2.1.0-1
+- Update to latest upstream
+
 * Thu Sep 13 2012 Jon Stanley <jonstanley at gmail.com> - 1.2-4.20120606git8266dff
 - Remove %%defattr