[blktrace] New upstream version 1.1.0

[Andrew Price]

commit 6df9427b347284d48261c669e64b3540cd0b4993
Author: Andrew Price <anprice at redhat.com>
Date:   Fri Sep 26 16:09:51 2014 +0100

    New upstream version 1.1.0
    
    * Fri Sep 26 2014 Andrew Price <anprice at redhat.com> - 1.1.0-1
    - New upstream version
    - Add iowatcher subpackage
    - Remove obsolete 'clean' and 'defattr' sections

 .gitignore    |    1 +
 blktrace.spec |   62 +++++++++++++++++++++++++++++++++++++++++++++-----------
 sources       |    2 +-
 3 files changed, 52 insertions(+), 13 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b7c7ca3..cb8b925 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ blktrace-1.0.1.tar.bz2
 /blktrace-1.0.3.tar.bz2
 /blktrace-1.0.4.tar.bz2
 /blktrace-1.0.5.tar.bz2
+/blktrace-1.1.0.tar.bz2
diff --git a/blktrace.spec b/blktrace.spec
index 8964148..f8571c4 100644
--- a/blktrace.spec
+++ b/blktrace.spec
@@ -1,14 +1,14 @@
-Summary: Utilities for performing block layer IO tracing in the linux kernel
+Summary: Utilities for performing block layer IO tracing in the Linux kernel
 Name: blktrace
-Version: 1.0.5
-Release: 7%{?dist}
+Version: 1.1.0
+Release: 1%{?dist}
 License: GPLv2+
 Group: Development/System
 Source:  http://brick.kernel.dk/snaps/blktrace-%{version}.tar.bz2
 Url: http://brick.kernel.dk/snaps
 
 Requires: python
-BuildRequires: libaio-devel python
+BuildRequires: libaio-devel python librsvg2-devel
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %description
@@ -28,19 +28,57 @@ make CFLAGS="%{optflags}" all
 
 %install
 rm -rf %{buildroot}
-make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/usr/share/man install
-
-%clean
-rm -rf %{buildroot}
+make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/%{_mandir} install
+# This will not be required for upstream versions > 1.1.0
+install -m 644 iowatcher/iowatcher.1 %{buildroot}/%{_mandir}/man1
 
 %files
-%defattr(-,root,root)
 %doc README COPYING
-%{_bindir}/*
-%attr(0644,root,root) /usr/share/man/man1/*
-%attr(0644,root,root) /usr/share/man/man8/*
+%{_bindir}/blkparse
+%{_bindir}/blkrawverify
+%{_bindir}/bno_plot.py
+%{_bindir}/btt
+%{_bindir}/verify_blkparse
+%{_bindir}/blkiomon
+%{_bindir}/blktrace
+%{_bindir}/btrace
+%{_bindir}/btrecord
+%{_bindir}/btreplay
+%{_mandir}/man1/blkparse.*
+%{_mandir}/man1/blkrawverify.*
+%{_mandir}/man1/bno_plot.*
+%{_mandir}/man1/btt.*
+%{_mandir}/man1/verify_blkparse.*
+%{_mandir}/man8/blkiomon.*
+%{_mandir}/man8/blktrace.*
+%{_mandir}/man8/btrace.*
+%{_mandir}/man8/btrecord.*
+%{_mandir}/man8/btreplay.*
+
+%package -n iowatcher
+Summary: Utility for visualizing block layer IO patterns and performance
+Requires: blktrace sysstat theora-tools
+
+%description -n iowatcher
+iowatcher generates graphs from blktrace runs to help visualize IO patterns and
+performance as SVG images or movies. It can plot multiple blktrace runs
+together, making it easy to compare the differences between different benchmark
+runs.
+
+You should install the iowatcher package if you need to visualize detailed
+information about IO patterns.
+
+%files -n iowatcher
+%doc README iowatcher/COPYING
+%{_bindir}/iowatcher
+%{_mandir}/man1/iowatcher.*
 
 %changelog
+* Fri Sep 26 2014 Andrew Price <anprice at redhat.com> - 1.1.0-1
+- New upstream version
+- Add iowatcher subpackage
+- Remove obsolete 'clean' and 'defattr' sections
+
 * Fri Aug 15 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.5-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
 
diff --git a/sources b/sources
index f3fbdda..3e8a130 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-02914c0b51fd16f36095436374e14cc7  blktrace-1.0.5.tar.bz2
+f759d09e315dbdc0ce1010ee747c6893  blktrace-1.1.0.tar.bz2