rpms/bacula/F-11 bacula-traymonitor.desktop.consolehelper, NONE, 1.1 bacula.spec, 1.25, 1.26

[Jon Ciesla]

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8239

Modified Files:
	bacula.spec 
Added Files:
	bacula-traymonitor.desktop.consolehelper 
Log Message:
gnome-console consolehelper correction. BZ 426790.
add tray-monitor to consolehelper. BZ 426790




--- NEW FILE bacula-traymonitor.desktop.consolehelper ---
[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


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-11/bacula.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- bacula.spec	23 Jul 2009 16:22:34 -0000	1.25
+++ bacula.spec	31 Jul 2009 13:48:26 -0000	1.26
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 4%{?dist}
+Release: 5%{?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
@@ -571,12 +572,14 @@ install -m 644 -D bacula-sqlite/scripts/
 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}/gnome-console
+ln -sf consolehelper %{buildroot}%{_bindir}/bgnome-console
 ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
 ln -sf consolehelper %{buildroot}%{_bindir}/bat
 install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
+ln -sf consolehelper %{buildroot}%{_bindir}/bacula-tray-monitor
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
@@ -817,7 +820,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*
@@ -962,8 +965,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
@@ -990,6 +996,10 @@ fi
 
 
 %changelog
+> * Thu Jul 30 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-5
+> - gnome-console consolehelper correction. BZ 426790.
+> - add tray-monitor to consolehelper. BZ 426790
+
 * Thu Jul 23 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-4
 - Put full paths in desktop files. BZ 426790.
 - Moved console requires from sysconfdir to common BZ 505755.