From 5a20cf965e131c2e90dcca5c2890aee7c3c0f8b6 Mon Sep 17 00:00:00 2001
From: Jon Ciesla <limb@fedoraproject.org>
Date: Jul 23 2009 16:22:34 +0000
Subject: Put full paths in desktop files. BZ 426790. Moved console requires from

    sysconfdir to common BZ 505755.

---

diff --git a/bacula-bat.desktop b/bacula-bat.desktop
index d841fc5..3b450e7 100644
--- a/bacula-bat.desktop
+++ b/bacula-bat.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
 Name=Bacula Bat Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=bat -c /etc/bacula/bat.conf
+Exec=/usr/sbin/bat -c /etc/bacula/bat.conf
 Icon=bat_icon
 Terminal=false
 Type=Application
diff --git a/bacula-bwxconsole.desktop b/bacula-bwxconsole.desktop
index bf71d77..00e4d5a 100644
--- a/bacula-bwxconsole.desktop
+++ b/bacula-bwxconsole.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
 Name=Bacula WX Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=bwxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/sbin/bwxconsole -c /etc/bacula/bwxconsole.conf
 Icon=wxwin16x16
 Terminal=false
 Type=Application
diff --git a/bacula-gconsole.desktop b/bacula-gconsole.desktop
index 10eb5e9..f21e4a7 100644
--- a/bacula-gconsole.desktop
+++ b/bacula-gconsole.desktop
@@ -4,9 +4,9 @@ Encoding=UTF-8
 Name=Bacula Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
-Icon=bacula
+Exec=/usr/sbin/bgnome-console -c /etc/bacula/bgnome-console.conf
+Icon=bacula.png
 Terminal=false
 Type=Application
-Categories=System;Application;
+Categories=System;Application;Utility
 
diff --git a/bacula-traymonitor.desktop b/bacula-traymonitor.desktop
index aaff951..7ddb212 100644
--- a/bacula-traymonitor.desktop
+++ b/bacula-traymonitor.desktop
@@ -4,8 +4,8 @@ Encoding=UTF-8
 Name=Bacula Monitor
 GenericName=Bacula Tray Monitor
 Comment=Monitor your Bacula Backup server
-Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor
+Exec=/usr/sbin/bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
+Icon=bacula-tray-monitor.xpm
 Terminal=false
 Type=Application
 Categories=System;Application;Utility
diff --git a/bacula-wxconsole.desktop b/bacula-wxconsole.desktop
index 5d8aac6..8cf7f11 100644
--- a/bacula-wxconsole.desktop
+++ b/bacula-wxconsole.desktop
@@ -4,7 +4,7 @@ Encoding=UTF-8
 Name=Bacula WX Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=wxconsole -c /etc/bacula/bwxconsole.conf
+Exec=/usr/sbin/wxconsole -c /etc/bacula/bwxconsole.conf
 Icon=wxwin16x16
 Terminal=false
 Type=Application
diff --git a/bacula.spec b/bacula.spec
index d92ff03..7a1633e 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -8,7 +8,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 # See LICENSE for details
 License: GPLv2 with exceptions
 Group: System Environment/Daemons
@@ -238,7 +238,7 @@ different computers. It is based on a client/server architecture.
 %package console
 Summary: Bacula management console
 Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
 
 %description console
 Bacula is a set of programs that allow you to manage the backup,
@@ -252,7 +252,7 @@ backup system.
 %package console-gnome
 Summary: Bacula console for the Gnome desktop environment
 Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
 Requires: usermode
 
 %description console-gnome
@@ -265,7 +265,7 @@ This package contains the gnome version of the bacula management console
 %package console-bat
 Summary: Bacula bat console
 Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
 Requires: usermode
 
 %description console-bat
@@ -279,7 +279,7 @@ This package contains the bat version of the bacula management console
 %package console-wxwidgets
 Summary: Bacula console using the wx widgets toolkit
 Group: System Environment/Daemons
-Requires: bacula-sysconfdir = %{version}-%{release}
+Requires: bacula-common = %{version}-%{release}
 Requires: usermode
 
 %description console-wxwidgets
@@ -990,6 +990,10 @@ fi
 
 
 %changelog
+* Thu Jul 23 2009 Jon Ciesla <limb@jcomserv.net - 2.4.4-4
+- Put full paths in desktop files. BZ 426790.
+- Moved console requires from sysconfdir to common BZ 505755.
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.4.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild