Update installation steps

bacula-install.patch

@@ -0,0 +1,73 @@
+diff -Naur bacula-9.6.2.old/autoconf/configure.in bacula-9.6.2/autoconf/configure.in
+--- bacula-9.6.2.old/autoconf/configure.in	2020-03-05 09:46:32.131750774 +0100
++++ bacula-9.6.2/autoconf/configure.in	2020-03-05 09:47:33.786041438 +0100
+@@ -3498,11 +3498,11 @@
+    src/qt-console/bat.pro.mingw32 \
+    src/qt-console/bat.pro.mingw64 \
+    src/qt-console/install_conf_file \
+-   src/qt-console/tray-monitor/tray-monitor.conf \
+    src/qt-console/tray-monitor/bacula-tray-monitor.conf \
+    src/qt-console/tray-monitor/tray-monitor.pro \
+    src/qt-console/tray-monitor/tray-monitor.pro.mingw32 \
+    src/qt-console/tray-monitor/tray-monitor.pro.mingw64 \
++   src/qt-console/tray-monitor/install_conf_file \
+    src/dird/Makefile \
+    src/dird/bacula-dir.conf \
+    src/lib/Makefile \
+@@ -3609,6 +3609,8 @@
+ 
+ cd src/qt-console
+ chmod 755 install_conf_file build-depkgs-qt-console
++cd tray-monitor
++chmod 755 install_conf_file build-depkgs-qt-console
+ cd ${BUILD_DIR}
+ 
+ cd scripts
+diff -Naur bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in bacula-9.6.2/examples/nagios/check_bacula/Makefile.in
+--- bacula-9.6.2.old/examples/nagios/check_bacula/Makefile.in	2020-03-05 09:46:32.128750711 +0100
++++ bacula-9.6.2/examples/nagios/check_bacula/Makefile.in	2020-03-05 09:46:40.145918546 +0100
+@@ -72,7 +72,7 @@
+ 	(cd $(srcdir); $(RMF) Makefile)
+ 
+ install: all
+-	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) check_bacula $(DESTDIR)$(sbindir)/check_bacula
++	$(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) .libs/check_bacula $(DESTDIR)$(sbindir)/check_bacula
+ 
+ uninstall:
+ 	(cd $(DESTDIR)$(sbindir); $(RMF) check_bacula)
+diff -Naur bacula-9.6.2.old/Makefile.in bacula-9.6.2/Makefile.in
+--- bacula-9.6.2.old/Makefile.in	2020-03-05 09:46:32.135750858 +0100
++++ bacula-9.6.2/Makefile.in	2020-03-05 09:46:40.146918567 +0100
+@@ -173,6 +173,8 @@
+ 	  done
+ 	(cd src/qt-console; \
+ 	 chmod 755 install_conf_file build-depkgs-qt-console)
++	(cd src/qt-console/tray-monitor; \
++	 chmod 755 install_conf_file build-depkgs-qt-console)
+ 
+ clean:
+ 	@for I in ${all_subdirs} ; \
+diff -Naur bacula-9.6.2.old/src/qt-console/bat.pro.in bacula-9.6.2/src/qt-console/bat.pro.in
+--- bacula-9.6.2.old/src/qt-console/bat.pro.in	2020-03-05 09:46:32.163751446 +0100
++++ bacula-9.6.2/src/qt-console/bat.pro.in	2020-03-05 09:46:40.146918567 +0100
+@@ -12,7 +12,7 @@
+ greaterThan(QT_MAJOR_VERSION, 4): QT += widgets
+ 
+ bins.path = /$(DESTDIR)@sbindir@
+-bins.files = bat
++bins.files = .libs/bat
+ confs.path = /$(DESTDIR)@sysconfdir@
+ confs.commands = ./install_conf_file
+ help.path = /$(DESTDIR)@htmldir@
+diff -Naur bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in
+--- bacula-9.6.2.old/src/qt-console/tray-monitor/tray-monitor.pro.in	2020-03-05 09:46:32.166751509 +0100
++++ bacula-9.6.2/src/qt-console/tray-monitor/tray-monitor.pro.in	2020-03-05 09:46:40.146918567 +0100
+@@ -26,7 +26,7 @@
+ 
+ 
+ bins.path = /$(DESTDIR)@sbindir@
+-bins.files = bacula-tray-monitor
++bins.files = .libs/bacula-tray-monitor
+ confs.path = /$(DESTDIR)@sysconfdir@
+ confs.commands = ./install_conf_file
+ 

bacula.spec

@@ -25,8 +25,7 @@ Source12:           %{name}-sd.service
 Source15:           %{name}-fd.sysconfig
 Source16:           %{name}-dir.sysconfig
 Source17:           %{name}-sd.sysconfig
-# Image taken from http://www.bacula.org/git/cgit.cgi/bacula/plain/bacula/src/tray-monitor/generic.xpm
+Source19:           https://salsa.debian.org/bacula-team/bacula/-/raw/master/debian/additions/bacula-tray-monitor.png#/bacula-tray-monitor.png
-Source19:           generic.xpm
 
 Patch1:             %{name}-openssl.patch
 Patch2:             %{name}-queryfile.patch
@@ -38,16 +37,15 @@ Patch7:             %{name}-non-free-code.patch
 # desktop-file-install not supported on RHEL 6
 Patch8:             %{name}-desktop.patch
 Patch9:             %{name}-g++-options.patch
-# https://sources.debian.org/patches/bacula/9.4.1-1/upstream/add-libs3-checks/
 Patch10:            %{name}-s3-configure.patch
 Patch11:            %{name}-ftbfs-f_type.patch
-
+Patch12:            %{name}-install.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
 # Without this, there is no library providing the correct shared object name
 # required by the daemons.
 # http://bugs.bacula.org/view.php?id=2084
-Patch12:            %{name}-autoconf.patch
+Patch13:            %{name}-autoconf.patch
 
 BuildRequires:      desktop-file-utils
 BuildRequires:      perl-generators
@@ -395,17 +393,14 @@ pushd src/qt-console/tray-monitor
     %{?qmake_qt4}%{!?qmake_qt4:qmake-qt4} tray-monitor.pro
 %endif
     %make_build
-    cp -f .libs/bacula-tray-monitor .
 popd
 
 # Convert image to png for tray monitor icon
-convert %{SOURCE19} bacula-tray-monitor.png
-
 %install
 %make_install
 
 # Nagios plugin
-install -p -m 755 -D examples/nagios/check_bacula/.libs/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
+install -p -m 755 -D examples/nagios/check_bacula/check_bacula %{buildroot}%{_libdir}/nagios/plugins/check_bacula
 
 # This will be managed through alternatives, as it requires the name to NOT
 # change between upgrades, so the versioned library name can not be used.
@@ -419,11 +414,8 @@ install -p -m 644 -D scripts/bat.desktop %{buildroot}%{_datadir}/applications/ba
 install -p -m 755 -D src/qt-console/.libs/bat %{buildroot}%{_sbindir}/bat
 %endif
 
-# 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 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
+install -p -m 644 -D %{SOURCE19} %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.png
 install -p -m 644 -D scripts/bacula-tray-monitor.desktop %{buildroot}%{_datadir}/applications/bacula-tray-monitor.desktop
 
 # Logrotate
@@ -731,7 +723,7 @@ fi
 %{_sbindir}/bat
 
 %files traymonitor
-%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf %attr(640,root,root)
+%config(noreplace) %{_sysconfdir}/bacula/bacula-tray-monitor.conf %attr(640,root,root)
 %{_datadir}/applications/bacula-tray-monitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.png
 %{_mandir}/man1/bacula-tray-monitor.1*

generic.xpm

@@ -1,45 +0,0 @@
-/* XPM */
-static const int xpm_generic_first_color = 6;
-static const int xpm_generic_second_color = 7;
-static const int xpm_generic_column = 5;
-static const char* xpm_generic[]={
-"32 32 7 1",
-". c None",
-"# c #000000",
-"a c #c0c0c0",
-"b c #808080",
-"c c #808000",
-"d c #0000ff",
-"e c #0000ff",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"................................",
-"....#########################...",
-"...#aaaaaaaaaaaaaaaaaaaaaaaa##..",
-"..#aaaaaaaaaaaaaaaaaaaaaaaaaa##.",
-"..##aaaaaaaaaaaaaaaaaaaaaaaaa##.",
-"..###########################b##",
-"..##........................bb##",
-"..##........................bb##",
-"..##..aaaaaaaaaaaaaaaaaaaaaabb##",
-"..##..aaabbbbbaaaaabbbbbaaaabb##",
-"..##..aac.....baaac.....baaabb##",
-"..##..ac..ddd..bac..eee..baabb##",
-"..##..ac.ddddd.bac.eeeee.baabb##",
-"..##..ac.ddddd.bac.eeeee.baabb##",
-"..##..ac.ddddd.bac.eeeee.baabb##",
-"..##..ac..ddd..bac..eee..baabb##",
-"..##..aac.....baaac.....baaabb##",
-"..##..aaacccccaaaaacccccaaaabb##",
-"..##..aaaaaaaaaaaaaaaaaaaaaabb##",
-"..##..aaaaaaaaaaaaaaaaaaaaaabb##",
-"..##bbbbbbbbbbbbbbbbbbbbbbbbbbb.",
-"....bbbbbbbbbbbbbbbbbbbbbbbbb#..",
-".....########################...",
-"......######################....",
-"................................",
-"................................"};