[innotop/f20] Add patches #1 and #2

[Fabio Alessandro Locati]

commit 0fb9ad6d97b10659111f649aa15e7579a19f9791
Author: Fabio Alessandro Locati <fabiolocati at gmail.com>
Date:   Sun Sep 28 17:04:37 2014 +0200

    Add patches #1 and #2

 innotop-fix-host-in-transactions.patch        |   20 ++++++++++++++++++++
 innotop-fix-hostname-width-in-querylist.patch |   11 +++++++++++
 innotop.spec                                  |   10 +++++++++-
 3 files changed, 40 insertions(+), 1 deletions(-)
---
diff --git a/innotop-fix-host-in-transactions.patch b/innotop-fix-host-in-transactions.patch
new file mode 100644
index 0000000..3464710
--- /dev/null
+++ b/innotop-fix-host-in-transactions.patch
@@ -0,0 +1,20 @@
+--- innotop.orig	2014-08-21 00:51:35.000000000 +0200
++++ innotop	2014-09-15 16:03:31.592582060 +0200
+@@ -2306,7 +2307,7 @@
+          has_read_view      => { src => 'has_read_view' },
+          heap_size          => { src => 'heap_size' },
+          host_and_domain    => { src => 'hostname' },
+-         hostname           => { src => $exprs{Host} },
++         hostname           => { src => 'hostname', minw => 7, maxw => 15 },
+          ip                 => { src => 'ip' },
+          lock_structs       => { src => 'lock_structs' },
+          lock_wait_time     => { src => 'lock_wait_time', trans => [ qw(secs_to_time) ] },
+@@ -2552,7 +2553,7 @@
+          active_secs        => { src => 'active_secs' },
+          has_read_view      => { src => 'has_read_view' },
+          heap_size          => { src => 'heap_size' },
+-         hostname           => { src => $exprs{Host} },
++         hostname           => { src => 'hostname', minw => 7, maxw => 15 },
+          ip                 => { src => 'ip' },
+          wait_status        => { src => 'lock_wait_status' },
+          lock_wait_time     => { src => 'lock_wait_time',      trans => [ qw(secs_to_time) ] },
diff --git a/innotop-fix-hostname-width-in-querylist.patch b/innotop-fix-hostname-width-in-querylist.patch
new file mode 100644
index 0000000..9616729
--- /dev/null
+++ b/innotop-fix-hostname-width-in-querylist.patch
@@ -0,0 +1,11 @@
+--- innotop.orig	2014-09-03 17:34:23.739123180 +0200
++++ innotop	2014-09-03 17:34:13.799579273 +0200
+@@ -2721,7 +2721,7 @@
+          cxn             => { src => 'cxn',        minw => 6,  maxw => 10 },
+          mysql_thread_id => { src => 'id',         minw => 6,  maxw => 0 },
+          user            => { src => 'user',       minw => 5,  maxw => 8 },
+-         hostname        => { src => $exprs{Host}, minw => 13, maxw => 8, },
++         hostname        => { src => $exprs{Host}, minw => 7,  maxw => 15, },
+          port            => { src => $exprs{Port}, minw => 0,  maxw => 0, },
+          host_and_port   => { src => 'host',       minw => 0,  maxw => 0 },
+          db              => { src => 'db',         minw => 6,  maxw => 12 },
diff --git a/innotop.spec b/innotop.spec
index 4415c83..154b501 100644
--- a/innotop.spec
+++ b/innotop.spec
@@ -1,6 +1,6 @@
 Name:           innotop
 Version:        1.9.1
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        A MySQL and InnoDB monitor program
 
 Group:          Applications/Databases
@@ -8,6 +8,8 @@ License:        GPLv2+ or Artistic
 URL:            http://code.google.com/p/innotop
 Source0:        http://innotop.googlecode.com/files/%{name}-%{version}.tar.gz
 Patch0:         innotop-fix-MariaDB-10.patch
+Patch1:         innotop-fix-hostname-width-in-querylist.patch
+Patch2:         innotop-fix-host-in-transactions.patch
 
 BuildArch:      noarch
 BuildRequires:  perl(Test::Simple) perl(DBI) perl(ExtUtils::MakeMaker) perl(Term::ReadKey) perl(DBD::mysql)
@@ -22,6 +24,8 @@ SHOW ENGINE INNODB STATUS, among other things.
 %prep
 %setup -q
 %patch0 -p0
+%patch1 -p0
+%patch2 -p0
 
 %build
 %{__perl} Makefile.PL INSTALLDIRS=vendor
@@ -44,6 +48,10 @@ make test
 %{_mandir}/man1/innotop.1*
 
 %changelog
+* Sun Sep 28 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-7
+- Add patch innotop-fix-hostname-width-in-querylist made by me (already got in touch with upstream)
+- Add patch innotop-fix-host-in-transactions made by me (already got in touch with upstream)
+
 * Thu Aug 21 2014 Fabio Alessandro Locati <fabiolocati at gmail.com> - 1.9.1-6
 - Solving last pieces of mess