30Oct04

[bacula/bacula] / bacula / platforms / redhat / bacula.spec.in

diff --git a/bacula/platforms/redhat/bacula.spec.in b/bacula/platforms/redhat/bacula.spec.in
index 7f72ccae46aac94164c631f9a7ced76dcbe85de3..7fcb127b0c7603c4166da603b647de9cb57e595e 100644 (file)
--- a/bacula/platforms/redhat/bacula.spec.in
+++ b/bacula/platforms/redhat/bacula.spec.in
@@ -429,7 +429,7 @@ patch src/cats/update_sqlite_tables.in src/cats/update_sqlite_tables.in.patch
         --enable-smartalloc \
         --enable-gnome \
        --enable-static-fd \
-%if ! %{rh7}
+%if ! %{rh7} && ! %{rh8}
        --enable-tray-monitor \
 %endif
 %if %{mysql}
@@ -559,6 +559,8 @@ cp -p scripts/bacula.desktop.gnome2.consolehelper $RPM_BUILD_ROOT/usr/share/appl
 cp -p scripts/gnome-console.console_apps $RPM_BUILD_ROOT/etc/security/console.apps/gnome-console
 cp -p scripts/gnome-console.pamd $RPM_BUILD_ROOT/etc/pam.d/gnome-console
 ln -sf consolehelper $RPM_BUILD_ROOT/usr/bin/gnome-console
+%endif
+%if ! %{rh7} && ! %{rh8}
 cp -p src/tray-monitor/generic.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/bacula-tray-monitor.xpm
 cp -p scripts/bacula-tray-monitor.desktop $RPM_BUILD_ROOT/usr/share/applications/bacula-tray-monitor.desktop
 %endif
@@ -597,6 +599,10 @@ cp -p updatedb/* $RPM_BUILD_ROOT/etc/bacula/updatedb/
 # now clean up permissions that are left broken by the install
 chmod o-r $RPM_BUILD_ROOT/etc/bacula/query.sql
 chmod o-rwx $RPM_BUILD_ROOT/var/bacula
+%if ! %{rh7} && ! %{rh8}
+chmod 755 $RPM_BUILD_ROOT/usr/sbin/bacula-tray-monitor
+chmod 644 $RPM_BUILD_ROOT/etc/bacula/tray-monitor.conf
+%endif
 
 %clean
 [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf "$RPM_BUILD_ROOT"
@@ -883,7 +889,7 @@ fi
 /etc/bacula/delete_catalog_backup
 /etc/bacula/mtx-changer
 /etc/bacula/btraceback.dbx
-/etc/bacula/btraceback.gbd
+/etc/bacula/btraceback.gdb
 /etc/init.d/bacula-dir
 /etc/init.d/bacula-fd
 /etc/init.d/bacula-sd
@@ -1072,10 +1078,14 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 /etc/bacula/gconsole
 %config(noreplace) /etc/bacula/gnome-console.conf
 /usr/share/pixmaps/bacula.png
+
 %if %{rh7}
 /usr/share/gnome/apps/System/bacula.desktop
 %else
 /usr/share/applications/bacula.desktop
+%endif
+
+%if ! %{rh7} && ! %{rh8}
 /usr/sbin/bacula-tray-monitor
 /etc/bacula/tray-monitor.conf
 /usr/share/pixmaps/bacula-tray-monitor.xpm
@@ -1091,6 +1101,9 @@ echo "The database update scripts were installed to /etc/bacula/updatedb"
 
 
 %changelog
+* Fri Oct 22 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
+- remove tray-monitor from RH8 build
+- fix permissions on tray-monitor files
 * Wed Oct 13 2004 D. Scott Barninger <barninger at fairfieldcomputers.com>
 - add Mandrake support and tray-monitor, misc changes for 1.35.8/1.36.0,
 - change database update to 7 to 8 upgrade,