diff --git a/SOURCES/Add-a-tuna.desktop-file.patch b/SOURCES/Add-a-tuna.desktop-file.patch
new file mode 100644
index 0000000..e4142ac
--- /dev/null
+++ b/SOURCES/Add-a-tuna.desktop-file.patch
@@ -0,0 +1,40 @@
+From 2cb0d5619a907cac929568afefda347bedfdfd16 Mon Sep 17 00:00:00 2001
+From: Guy Streeter <streeter@redhat.com>
+Date: Wed, 5 Feb 2014 15:40:36 -0600
+Subject: [PATCH] Add a tuna.desktop file
+
+Add a tuna.desktop file
+
+commit 2cb0d5619a907cac929568afefda347bedfdfd16 upstream
+
+Bugzilla: 996954
+
+change the desktop icon
+
+Signed-off-by: Guy Streeter <streeter@redhat.com>
+Tested-by: Jiri Kastner <jkastner@redhat.com>
+Signed-off-by: Jiri Kastner <jkastner@redhat.com>
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ tuna.desktop | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 tuna.desktop
+
+diff --git a/tuna.desktop b/tuna.desktop
+new file mode 100644
+index 000000000000..603011f79467
+--- /dev/null
++++ b/tuna.desktop
+@@ -0,0 +1,9 @@
++[Desktop Entry]
++Name=tuna
++GenericName=Application Tuner
++Exec=tuna --gui
++Type=Application
++Terminal=false
++Comment=Thread and IRQ attribute management
++Icon=gtk-preferences
++Categories=System;Settings;
+--
+1.8.1.4
+
diff --git a/SOURCES/CLI-fix-traceback-due-unavailable-display.patch b/SOURCES/CLI-fix-traceback-due-unavailable-display.patch
new file mode 100644
index 0000000..6b4a372
--- /dev/null
+++ b/SOURCES/CLI-fix-traceback-due-unavailable-display.patch
@@ -0,0 +1,35 @@
+From f5d8f1c71b51017eabb53247def4572e6ff7214b Mon Sep 17 00:00:00 2001
+From: Petr Oros <poros@redhat.com>
+Date: Wed, 4 Dec 2013 07:29:35 +0000
+Subject: [PATCH] CLI: fix traceback due unavailable display
+
+commit 5d555e0eb046a0df201f0e3aaabb03296944151b upstream
+
+Bugzilla: 1035853
+
+Tuna showing traceback when user haven't set DISPLAY variable and using CLI with param -l.
+This is caused by gtk library which try create "window", but in CLI mode is not neccesary.
+Patch remove unnecesary library which cause this problem
+
+Tested-by: Jiri Kastner <jkastner@redhat.com>
+Signed-off-by: Petr Oros <poros@redhat.com>
+Signed-off-by: Jiri Kastner <jkastner@redhat.com>
+Signed-off-by: John Kacur <jkacur@redhat.com>
+---
+ tuna/config.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tuna/config.py b/tuna/config.py
+index e4464478fc2e..77cc4d800c03 100644
+--- a/tuna/config.py
++++ b/tuna/config.py
+@@ -1,5 +1,5 @@
+ import io, os, re, fnmatch
+-import sys, gtk, pygtk
++import sys, pygtk
+ import codecs, ConfigParser
+ from time import localtime, strftime
+ from subprocess import Popen, PIPE, STDOUT, call
+--
+1.8.3.1
+
diff --git a/SPECS/tuna.spec b/SPECS/tuna.spec
index e7fe35a..dd7f326 100644
--- a/SPECS/tuna.spec
+++ b/SPECS/tuna.spec
@@ -3,22 +3,25 @@
Name: tuna
Version: 0.11.1
-Release: 6%{?dist}
+Release: 8%{?dist}
License: GPLv2
Summary: Application tuning GUI & command line utility
Group: Applications/System
Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2
+
Patch1: spec-Mark-configuration-files-with-config.patch
Patch2: git-housekeeping-Add-the-.gitattributes-file.patch
Patch3: CLI-fix-ps_show_thread-call-with-bad-args-count.patch
Patch4: spec-Show-where-the-original-source-comes-from-in-co.patch
Patch5: tuna-modified-sysctl-settings-in-example.conf.patch
Patch6: CLI-fix-traceback-where-enter-p-policy-without-prio.patch
+Patch7: Add-a-tuna.desktop-file.patch
+Patch8: CLI-fix-traceback-due-unavailable-display.patch
URL: http://userweb.kernel.org/~acme/tuna/
# Real source is now at git://git.kernel.org/pub/scm/utils/tuna/tuna
BuildArch: noarch
-BuildRequires: python-devel, gettext
+BuildRequires: python-devel, gettext, desktop-file-utils
Requires: python-ethtool
Requires: python-linux-procfs >= 0.4.5
Requires: python-schedutils >= 0.2
@@ -59,6 +62,8 @@ priority is changed, be it using tuna or plain chrt & taskset.
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
+%patch8 -p1
%build
%{__python} setup.py build
@@ -77,6 +82,7 @@ install -p -m644 docs/tuna.8 %{buildroot}/%{_mandir}/man8/
install -p -m644 etc/tuna/example.conf %{buildroot}/%{_sysconfdir}/tuna/
install -p -m644 etc/tuna.conf %{buildroot}/%{_sysconfdir}/
install -p -m644 org.tuna.policy %{buildroot}/%{_datadir}/polkit-1/actions/
+desktop-file-install --dir=%{buildroot}/%{_datadir}/applications tuna.desktop
# l10n-ed message catalogues
for lng in `cat po/LINGUAS`; do
@@ -103,6 +109,7 @@ rm -rf %{buildroot}
%config(noreplace) %{_sysconfdir}/tuna.conf
%config %{_sysconfdir}/tuna/example.conf
%{_datadir}/polkit-1/actions/org.tuna.policy
+%{_datadir}/applications/tuna.desktop
%files -n oscilloscope
%defattr(-,root,root,-)
@@ -111,7 +118,15 @@ rm -rf %{buildroot}
%doc docs/oscilloscope+tuna.pdf
%changelog
-* Tue Mar 10 2014 John Kacur <jkacur@redhat.com> - 0.11.1-6
+* Mon Oct 20 2014 John Kacur <jkacur@redhat.com> - 0.11.1-8
+- CLI-fix-traceback-due-unavailable-display.patch
+Resolves: rhbz#1035853
+
+* Fri Sep 12 2014 John Kacur <jkacur@redhat.com> - 0.11.1-7
+- Add a tuna.desktop file
+Resolves: rhbz#996954
+
+* Tue Mar 11 2014 John Kacur <jkacur@redhat.com> - 0.11.1-6
- tuna-modified-sysctl-settings-in-example.conf (1031582)
- CLI-fix-traceback-where-enter-p-policy-without-prio (1035794)
Resolves: rhbz#1035794