--- rpms/bacula/contribs8/bacula.spec	2010/12/03 17:41:52	1.1
+++ rpms/bacula/contribs8/bacula.spec	2010/12/04 16:31:52	1.2
@@ -1,3 +1,7 @@
+# $Id$
+# Authority: slords
+# Name: Shad L. Lords
+
 %{!?perl_vendorlib:  %define perl_vendorlib  %(eval "`%{__perl} -V:installvendorlib`" ; echo $installvendorlib)}
 %{!?perl_vendorarch: %define perl_vendorarch %(eval "`%{__perl} -V:installvendorarch`"; echo $installvendorarch)}
 %{!?perl_version:    %define perl_version    %(eval "`%{__perl} -V:version`"          ; echo $version)}
@@ -41,7 +45,6 @@ Patch20:           %{name}-3.0.2-fd_acl_
 Patch21:           %{name}-5.0.3-clientrunbeforejob.patch
 URL:               http://www.%{name}.org/
 Buildroot:         %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Vendor:            The Bacula Team
 Requires(pre):     /usr/sbin/groupadd /usr/sbin/useradd
 Requires(post):    /sbin/ldconfig openssl
 BuildRequires:     gettext httpd mkisofs mtx pkgconfig
@@ -49,7 +52,7 @@ BuildRequires:     tcp_wrappers tetex-la
 BuildRequires:     libacl-devel libstdc++-devel openssl-devel
 BuildRequires:     mysql-devel postgresql-devel sqlite-devel
 BuildRequires:     python-devel readline-devel libxml2-devel
-BuildRequires:     glib2-devel gtk2-devel pango-devel latex2html
+BuildRequires:     glib2-devel gtk2-devel pango-devel
 BuildRequires:     libcap-devel ncurses-devel zlib-devel
 BuildRequires:     perl(CGI) perl(DBI) perl(Date::Calc) perl(Expect)
 BuildRequires:     perl(GD::Graph) perl(GD) perl(HTML::Template)
@@ -171,20 +174,6 @@ Requires(post):    /sbin/restorecon %{_s
 %description       gui-bweb-selinux
 This package enables %{name}-gui-bweb to work with SELinux.
 
-
-%package           gui-monitor
-Summary:           The Bacula tray monitor
-Group:             Applications/System
-Requires:          %{name} = %{version}-%{release}
-
-%description       gui-monitor
-This package contains the Bacula Monitor service which is the program that
-allows the administrator or user to watch current status of Bacula Directors
-(DIR), Bacula File Daemons (FD) and Bacula Storage Daemons (SD). Currently,
-only a GTK+ version is available, which works with Gnome, KDE, or any window
-manager that supports the FreeDesktop.org system tray standard.
-
-
 %package           gui-web
 Summary:           The Bacula web utility
 Group:             Applications/Internet
@@ -324,7 +313,7 @@ BuildApp() {
 	--with-plugindir=%{_libdir}/%{name}              \
 	--with-archivedir=/tmp                           \
 	--disable-bat                                    \
-	--enable-tray-monitor                            \
+	--disable-tray-monitor                           \
 	--disable-bwx-console                            \
 	--enable-lockmgr                                 \
 	--enable-ipv6                                    \
@@ -468,6 +457,7 @@ touch                ${RPM_BUILD_ROOT}%{
 # Installed but unpackaged files
 %{__rm}      -rf     ${RPM_BUILD_ROOT}%{_mandir}/man1/bat.1*
 %{__rm}      -rf     ${RPM_BUILD_ROOT}%{_mandir}/man1/bacula-bwxconsole.1*
+%{__rm}      -rf     ${RPM_BUILD_ROOT}%{_mandir}/man1/bacula-tray-monitor.1*
 
 # Install DB update scripts
 %{__install} -m 0644 updatedb/README   ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/updatedb
@@ -482,12 +472,6 @@ touch                ${RPM_BUILD_ROOT}%{
 %{__install} -m 0644 scripts/logwatch/services.%{name}.conf       \
 	${RPM_BUILD_ROOT}%{_sysconfdir}/log.d/conf/services/%{name}.conf
 
-# Install GUI addons
-%{__install} -m 0644 src/tray-monitor/generic.xpm                 \
-	${RPM_BUILD_ROOT}%{_datadir}/pixmaps/%{name}-tray-monitor.xpm
-%{__install} -m 0644 scripts/%{name}-tray-monitor.desktop         \
-	${RPM_BUILD_ROOT}%{_datadir}/applications
-
 pushd %{name}-gui-%{bacula_ver}
 pushd bimagemgr
 %{__make} \
@@ -630,16 +614,6 @@ if /usr/sbin/selinuxenabled && [ -e /sel
   /sbin/restorecon -R %{_localstatedir}/cache/bweb
 fi
 
-%post gui-monitor
-# Update config
-for STRING in HOSTNAME DIR_MON_PASS FD_MON_PASS SD_MON_PASS; do
-  REPLACE="`%{__grep} ${STRING} %{_sysconfdir}/%{name}/support.pkg 2>/dev/null | cut -d= -f2`"
-
-  if [ -n "${REPLACE}" ]; then
-    %{__sed} -i -e "s:XXX_${STRING}_XXX:${REPLACE}:g" %{_sysconfdir}/%{name}/tray-monitor.conf
-  fi
-done
-
 %post server-sqlite
 # Update config
 for STRING in HOSTNAME DIR_PASS FD_PASS SD_PASS DIR_MON_PASS SD_MON_PASS; do
@@ -871,14 +845,6 @@ fi
 %files gui-bweb-selinux
 %defattr(-,root,root)
 
-%files gui-monitor
-%defattr(-,root,root)
-%attr(644,root,%{name}) %config(noreplace) %{_sysconfdir}/%{name}/tray-monitor.conf
-%attr(755,root,%{name}) %{_bindir}/bacula-tray-monitor
-%{_mandir}/man1/bacula-tray-monitor.1*
-%{_datadir}/applications/bacula-tray-monitor.desktop
-%{_datadir}/pixmaps/bacula-tray-monitor.xpm
-
 %files gui-web
 %defattr(-,root,root)
 %doc %{name}-gui-%{version}/%{name}-web/{CONTACT,COPYING,ChangeLog,README,TODO}