From e397501cfedb78a2d0065c32d36c361c12b9a890 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Wed, 15 Jul 2015 10:04:11 +0200
Subject: [PATCH] Use an external tray icon for tray monitor

---
 bacula.spec | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bacula.spec b/bacula.spec
index caf2471..650c333 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -30,6 +30,8 @@ Source15:           %{name}-fd.sysconfig
 Source16:           %{name}-dir.sysconfig
 Source17:           %{name}-sd.sysconfig
 Source18:           %{name}-sd.sysconfig.el5
+# Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm
+Source19:           generic.xpm
 
 Patch1:             %{name}-7.0.3-openssl.patch
 Patch2:             %{name}-7.0.0-queryfile.patch
@@ -51,6 +53,8 @@ BuildRequires:      desktop-file-utils
 BuildRequires:      perl
 BuildRequires:      sed
 
+BuildRequires:      gcc
+BuildRequires:      gcc-c++
 BuildRequires:      glibc-devel
 BuildRequires:      libacl-devel
 BuildRequires:      libstdc++-devel
@@ -68,6 +72,7 @@ BuildRequires:      zlib-devel
 %if 0%{?fedora} || 0%{?rhel} >= 6
 BuildRequires:      qt4-devel >= 4.6.2
 BuildRequires:      tcp_wrappers-devel
+BuildRequires:      ImageMagick
 %else
 BuildRequires:      tcp_wrappers
 %endif
@@ -394,6 +399,8 @@ pushd src/qt-console/tray-monitor
     make %{?_smp_mflags}
     cp -f .libs/bacula-tray-monitor .
 popd
+# Convert image to png for tray monitor icon
+convert %{SOURCE19} bacula-tray-monitor.png
 %endif
 
 %install
@@ -415,8 +422,8 @@ desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
 # QT Tray monitor
 install -p -m 755 -D src/qt-console/tray-monitor/bacula-tray-monitor %{buildroot}%{_sbindir}/bacula-tray-monitor
 install -p -m 644 -D src/qt-console/tray-monitor/tray-monitor.conf %{buildroot}%{_sysconfdir}/bacula/tray-monitor.conf
-install -p -m 644 -D src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
 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}
 
 %else
@@ -768,6 +775,10 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Wed Jul 15 2015 Marcin Haba <marcin.haba@bacula.pl> - 7.0.5-9
+- Use an external icon for tray monitor.
+- Add gcc and gcc-c++ to build requires.
+
 * Wed Jun 17 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.5-8
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild