From 08f1b7dfc79c6c5ccb539dc7490fde95748f5f8a Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Jul 11 2017 07:55:22 +0000
Subject: Use source files for tray monitor desktop entry


---

diff --git a/bacula-traymonitor.desktop b/bacula-traymonitor.desktop
deleted file mode 100644
index adad17b..0000000
--- a/bacula-traymonitor.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Encoding=UTF-8
-Name=Bacula Monitor
-GenericName=Bacula Tray Monitor
-Comment=Monitor your Bacula Backup server
-Exec=/usr/sbin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor
-Terminal=false
-Type=Application
-Categories=System;Application;Utility
diff --git a/bacula.spec b/bacula.spec
index 1f4db70..73b37ea 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -22,7 +22,6 @@ Source9:            %{name}-sd.init
 Source10:           %{name}-fd.service
 Source11:           %{name}-dir.service
 Source12:           %{name}-sd.service
-Source14:           %{name}-traymonitor.desktop
 Source15:           %{name}-fd.sysconfig
 Source16:           %{name}-dir.sysconfig
 Source17:           %{name}-sd.sysconfig
@@ -36,6 +35,7 @@ Patch4:             %{name}-9.0.0-bat-build.patch
 Patch5:             %{name}-9.0.0-seg-fault.patch
 Patch6:             %{name}-5.2.13-logwatch.patch
 Patch7:             %{name}-9.0.0-non-free-code.patch
+Patch8:             %{name}-9.0.0-tray-monitor-desktop.patch
 
 # Original patch removed by mistake, upstream is not willing to add it again:
 # http://www.bacula.org/git/cgit.cgi/bacula/commit/?h=Branch-7.0&id=51b3b98fb77ab3c0decee455cc6c4d2eb3c5303a
@@ -316,6 +316,8 @@ Provides check_bacula support for Nagios.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
+%patch8 -p1
+
 %patch10 -p1
 
 %patch11 -p2
@@ -405,7 +407,12 @@ install -p -m 755 -D src/qt-console/tray-monitor/bacula-tray-monitor %{buildroot
 install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
 install -p -m 644 -D manpages/bacula-tray-monitor.1 %{buildroot}%{_mandir}/man1/bacula-tray-monitor.1
 install -p -m 644 -D bacula-tray-monitor.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE14}
+desktop-file-install \
+    --dir=%{buildroot}%{_datadir}/applications \
+    --remove-key=Encoding \
+    --set-key=Categories --set-value="Utility" \
+    --set-key=Icon --set-value="/usr/share/pixmaps/bacula-tray-monitor.png" \
+    scripts/bacula-tray-monitor.desktop
 
 # Logrotate
 mkdir -p %{buildroot}%{_localstatedir}/log/bacula
@@ -711,7 +718,7 @@ fi
 
 %files traymonitor
 %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
-%{_datadir}/applications/bacula-traymonitor.desktop
+%{_datadir}/applications/bacula-tray-monitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.png
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_sbindir}/bacula-tray-monitor
@@ -730,7 +737,7 @@ fi
 %changelog
 * Tue Jul 11 2017 Simone Caronni <negativo17@gmail.com> - 9.0.0-2
 - Fix ppc64le build.
-- Fix tray-monitor build.
+- Fix tray-monitor build. Use source file for tray monitor desktop entry.
 
 * Mon Jul 10 2017 Simone Caronni <negativo17@gmail.com> - 9.0.0-1
 - Update to 9.0.0, update all patches.