gnome-console consolehelper correction. BZ 426790. add tray-monitor to

consolehelper. BZ 426790

bacula-traymonitor.desktop.consolehelper

@@ -0,0 +1,11 @@
+[Desktop Entry]
+Version=1.0
+Encoding=UTF-8
+Name=Bacula Monitor
+GenericName=Bacula Tray Monitor
+Comment=Monitor your Bacula Backup server
+Exec=/usr/bin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
+Icon=bacula-tray-monitor.xpm
+Terminal=false
+Type=Application
+Categories=System;Application;Utility

bacula.spec

@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 3.0.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -25,6 +25,7 @@ Source9: bacula-sd.init
 #Source10: http://download.sourceforge.net/bacula/bacula-gui-%{gui_version}.tar.gz
 #Source11: bacula-web.apache
 Source12: bacula-bat.desktop
+Source13: bacula-traymonitor.desktop.consolehelper
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
 #Patch2: bacula-wxconsole.patch
@@ -572,11 +573,13 @@ install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysco
 install -m 644 -D bacula-sqlite/scripts/bat.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bat
 install -m 644 -D bacula-sqlite/src/tray-monitor/generic.xpm %{buildroot}%{_datadir}/pixmaps/bacula-tray-monitor.xpm
 install -m 644 -D bacula-sqlite/src/qt-console/images/bat_icon.png %{buildroot}%{_datadir}/pixmaps/bat_icon.png
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bacula-tray-monitor
+install -m 644 %{SOURCE13} %{buildroot}%{_sysconfdir}/security/console.apps/bacula-tray-monitor
 
-
+ln -sf consolehelper %{buildroot}%{_bindir}/bgnome-console
-ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
 ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
 ln -sf consolehelper %{buildroot}%{_bindir}/bat
+ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor
 install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
@@ -823,7 +826,7 @@ fi
 %config %{_sysconfdir}/security/console.apps/bgnome-console
 %config %{_sysconfdir}/pam.d/bgnome-console
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bgnome-console.conf
-%{_bindir}/gnome-console
+%{_bindir}/bgnome-console
 %{_sbindir}/bgnome-console
 %{_mandir}/man1/bacula-bgnome-console.1.gz
 #%{_mandir}/man1/bacula-bconsole-gnome.1*
@@ -968,8 +971,11 @@ fi
 
 %files traymonitor
 %defattr(-,root,root,-)
+%{_bindir}/bacula-tray-monitor
 %{_sbindir}/bacula-tray-monitor
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
+%config %{_sysconfdir}/security/console.apps/bacula-tray-monitor
+%config %{_sysconfdir}/pam.d/bacula-tray-monitor
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_datadir}/applications/fedora-bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.xpm
@@ -997,6 +1003,10 @@ fi
 
 
 %changelog
+* Thu Jul 30 2009 Jon Ciesla <limb@jcomserv.net - 3.0.2-2
+- gnome-console consolehelper correction. BZ 426790.
+- add tray-monitor to consolehelper. BZ 426790
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.0.2-1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild