rpms/bacula/devel bacula-bat.desktop, 1.1, 1.2 bacula-bwxconsole.desktop, 1.1, 1.2 bacula-gconsole.desktop, 1.2, 1.3 bacula-traymonitor.desktop, 1.1, 1.2 bacula-wxconsole.desktop, 1.2, 1.3 bacula.spec, 1.13, 1.14

Mon Nov 17 18:08:05 UTC 2008

Author: limb

Update of /cvs/pkgs/rpms/bacula/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27092

Modified Files:
	bacula-bat.desktop bacula-bwxconsole.desktop 
	bacula-gconsole.desktop bacula-traymonitor.desktop 
	bacula-wxconsole.desktop bacula.spec 
Log Message:
Enable bat, BZ 470800.



Index: bacula-bat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-bat.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- bacula-bat.desktop	30 Jul 2008 14:21:54 -0000	1.1
+++ bacula-bat.desktop	17 Nov 2008 18:07:32 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bat -c /etc/bacula/bat.conf
-Icon=bacula.png
+Icon=bat_icon
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-bwxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-bwxconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-bwxconsole.desktop	30 Jul 2008 14:21:54 -0000	1.1
+++ bacula-bwxconsole.desktop	17 Nov 2008 18:07:33 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bwxconsole -c /etc/bacula/bwxconsole.conf
-Icon=wxwin16x16.xpm
+Icon=wxwin16x16
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-gconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-gconsole.desktop	30 Jul 2008 13:52:01 -0000	1.2
+++ bacula-gconsole.desktop	17 Nov 2008 18:07:33 -0000	1.3
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
-Icon=bacula.png
+Icon=bacula
 Terminal=false
 Type=Application
 Categories=System;Application;


Index: bacula-traymonitor.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-traymonitor.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-traymonitor.desktop	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-traymonitor.desktop	17 Nov 2008 18:07:33 -0000	1.2
@@ -5,7 +5,7 @@
 GenericName=Bacula Tray Monitor
 Comment=Monitor your Bacula Backup server
 Exec=bacula-tray-monitor -c /etc/bacula/tray-monitor.conf
-Icon=bacula-tray-monitor.xpm
+Icon=bacula-tray-monitor
 Terminal=false
 Type=Application
 Categories=System;Application;Utility


Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula-wxconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-wxconsole.desktop	30 Jul 2008 13:52:01 -0000	1.2
+++ bacula-wxconsole.desktop	17 Nov 2008 18:07:33 -0000	1.3
@@ -5,7 +5,7 @@
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
 Exec=wxconsole -c /etc/bacula/bwxconsole.conf
-Icon=wxwin16x16.xpm
+Icon=wxwin16x16
 Terminal=false
 Type=Application
 Categories=System;Application;


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/devel/bacula.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- bacula.spec	22 Oct 2008 19:33:30 -0000	1.13
+++ bacula.spec	17 Nov 2008 18:07:33 -0000	1.14
@@ -9,7 +9,7 @@
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
 Version: 2.4.3
-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
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
 #Patch2: bacula-wxconsole.patch
@@ -46,7 +47,7 @@
 BuildRequires: mysql-devel, cdrecord, postgresql-devel, wxGTK-devel
 BuildRequires: desktop-file-utils, python-devel, sqlite-devel, sed,
 BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
-BuildRequires: dvipdfm
+BuildRequires: dvipdfm, qwt-devel
 
 %if 0%{?fedora} >= 7
 BuildRequires: tcp_wrappers-devel
@@ -256,6 +257,18 @@
 
 This package contains the gnome version of the bacula management console
 
+%package console-bat
+Summary: Bacula bat console
+Group: System Environment/Daemons
+Requires: usermode
+
+%description console-bat
+Bacula is a set of programs that allow you to manage the backup,
+recovery, and verification of computer data across a network of
+different computers. It is based on a client/server architecture.
+
+This package contains the bat version of the bacula management console
+
 
 %package console-wxwidgets
 Summary: Bacula console using the wx widgets toolkit
@@ -387,6 +400,8 @@
 	--with-python \
 	--enable-smartalloc \
 	--with-x \
+	--enable-bat \
+	--with-qwt=/usr/lib \
 	$*
 # Scratch this, it is trouble
 #	--with-readline \
@@ -531,13 +546,18 @@
 install -m 644 -D bacula-sqlite/scripts/wxconsole.pamd %{buildroot}%{_sysconfdir}/pam.d/wxconsole
 install -m 644 -D bacula-sqlite/scripts/wxconsole.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/wxconsole
 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
+
 
 ln -sf consolehelper %{buildroot}%{_bindir}/gnome-console
 ln -sf consolehelper %{buildroot}%{_bindir}/wxconsole
+#ln -sf consolehelper %{buildroot}%{_bindir}/bat
+install -m 755 bacula-sqlite/src/qt-console/bat %{buildroot}%{_sbindir}
 
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE3}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE4}
 desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE5}
+desktop-file-install --vendor="fedora" --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
 
 
 # logrotate
@@ -774,6 +794,17 @@
 %{_datadir}/applications/fedora-bacula-gconsole.desktop
 %{_datadir}/pixmaps/bacula.png
 
+%files console-bat
+%defattr(-,root,root,-)
+#%config %{_sysconfdir}/security/console.apps/bat
+#%config %{_sysconfdir}/pam.d/bat
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bat.conf
+#%{_bindir}/bat
+%{_sbindir}/bat
+%{_mandir}/man1/bat.1.gz
+%{_datadir}/applications/fedora-bacula-bat.desktop
+%{_datadir}/pixmaps/bat_icon.png
+
 
 %files console-wxwidgets
 %defattr(-,root,root,-)
@@ -798,7 +829,6 @@
 %{_initrddir}/bacula-dir
 %{_sbindir}/bregex
 %{_sbindir}/bwild
-%{_mandir}/man1/bat.1.gz
 %{_mandir}/man8/dbcheck.8*
 %{_mandir}/man8/bacula-dir.8*
 %{_libexecdir}/bacula/delete_catalog_backup
@@ -930,6 +960,9 @@
 
 
 %changelog
+* Mon Nov 10 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-2
+- Added bat.  BZ 470800.
+
 * Wed Oct 22 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-1
 - Update to 2.4.3.
 


