rpms/bacula/F-9 bacula-bat.desktop, NONE, 1.1 bacula-bwxconsole.desktop, NONE, 1.1 bacula-config.patch, 1.1, 1.2 bacula-gconsole.desktop, 1.1, 1.2 bacula-pamd.patch, 1.1, 1.2 bacula-wxconsole.desktop, 1.1, 1.2 bacula.spec, 1.7, 1.8 sources, 1.2, 1.3

[Jon Ciesla (limb)]

Author: limb

Update of /cvs/pkgs/rpms/bacula/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14703

Modified Files:
	bacula-config.patch bacula-gconsole.desktop bacula-pamd.patch 
	bacula-wxconsole.desktop bacula.spec sources 
Added Files:
	bacula-bat.desktop bacula-bwxconsole.desktop 
Log Message:
 * Wed Jul 30 2008 Andreas Thienemann <athienem at redhat.com> - 2.2.8-2
> - Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide
>
> * Fri Jul 25 2008 Jon Ciesla <limb at jcomserv.net> - 2.2.8-1
> - Update to 2.2.8. BZ 446461.
> - Dropped director and storage DB-server hard Reqs. BZ 426788.
> - .desktop fixes.  BZ 450278, 426789.
> - Updated config patch.
> - Dropped wxconsole patch, applied upstream.
> - Updated pamd patch.
> - Dropped ampm patch, applied upstream.
> - Dropped maxbyteslist patch, N/A.
> - Dropped maxwaittime patch, applied upstream.
> - Dropped scheduler-next-hour patch, applied upstream.
> - Dropped verify patch, applied upstream.
> - Dropped tls-disconnect patch, applied upstream.
> - Fix for 426791.
> - Introduced patch fuzz workaround, will fix.
>




--- NEW FILE bacula-bat.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Bacula Bat Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
Exec=bat -c /etc/bacula/bat.conf
Icon=bacula.png
Terminal=false
Type=Application
Categories=System;Application;Utility



--- NEW FILE bacula-bwxconsole.desktop ---
[Desktop Entry]
Version=1.0
Encoding=UTF-8
Name=Bacula WX Console
GenericName=Backup Management Console
Comment=Control your Bacula Server
Exec=bwxconsole -c /etc/bacula/bwxconsole.conf
Icon=wxwin16x16.xpm
Terminal=false
Type=Application
Categories=System;Application;Utility

bacula-config.patch:

Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-config.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-config.patch	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-config.patch	31 Jul 2008 12:18:40 -0000	1.2
@@ -1,5 +1,5 @@
---- bacula-2.0.2/src/gnome2-console/gnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
-+++ bacula-2.0.2/src/gnome2-console/gnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
+--- bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in.orig	2007-02-06 13:35:12.000000000 +0100
++++ bacula-2.0.2/src/gnome2-console/bgnome-console.conf.in	2007-02-06 13:35:25.000000000 +0100
 @@ -3,9 +3,9 @@
  #
  
@@ -202,8 +202,8 @@
 -  director = @hostname at -dir = all
 +  director = bacula-dir = all
  }
---- bacula-2.0.2/src/wx-console/wx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
-+++ bacula-2.0.2/src/wx-console/wx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
+--- bacula-2.0.2/src/wx-console/bwx-console.conf.in.orig	2007-02-06 13:37:12.000000000 +0100
++++ bacula-2.0.2/src/wx-console/bwx-console.conf.in	2007-02-06 13:47:02.000000000 +0100
 @@ -3,8 +3,8 @@
  #
  


Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-gconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-gconsole.desktop	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-gconsole.desktop	31 Jul 2008 12:18:40 -0000	1.2
@@ -4,9 +4,9 @@
 Name=Bacula Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=gnome-console -c /etc/bacula/wxconsole.conf
+Exec=bgnome-console -c /etc/bacula/bgnome-console.conf
 Icon=bacula.png
 Terminal=false
 Type=Application
-Categories=System;Application;Utility
+Categories=System;Application;
 

bacula-pamd.patch:

Index: bacula-pamd.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-pamd.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-pamd.patch	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-pamd.patch	31 Jul 2008 12:18:40 -0000	1.2
@@ -9,8 +9,8 @@
  session    optional     pam_xauth.so
  session    optional     pam_timestamp.so
  account    required     pam_permit.so
---- bacula-2.0.3/scripts/gnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
-+++ bacula-2.0.3/scripts/gnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
+--- bacula-2.0.3/scripts/bgnome-console.pamd.orig        2007-07-11 18:42:33.000000000 +0200
++++ bacula-2.0.3/scripts/bgnome-console.pamd     2007-07-11 18:42:57.000000000 +0200
 @@ -1,7 +1,7 @@
  #%PAM-1.0
  auth       sufficient   pam_rootok.so


Index: bacula-wxconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-wxconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-wxconsole.desktop	24 Jul 2007 20:11:04 -0000	1.1
+++ bacula-wxconsole.desktop	31 Jul 2008 12:18:40 -0000	1.2
@@ -4,8 +4,8 @@
 Name=Bacula WX Console
 GenericName=Backup Management Console
 Comment=Control your Bacula Server
-Exec=wxconsole -c /etc/bacula/wxconsole.conf
+Exec=wxconsole -c /etc/bacula/bwxconsole.conf
 Icon=wxwin16x16.xpm
 Terminal=false
 Type=Application
-Categories=System;Application;Utility
+Categories=System;Application;


Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- bacula.spec	30 Jul 2008 19:16:20 -0000	1.7
+++ bacula.spec	31 Jul 2008 12:18:40 -0000	1.8
@@ -4,15 +4,17 @@
 %define docs_version	%{version}
 %define gui_version	%{version}
 %define config_dir	%{_sysconfdir}/bacula
+%define _default_patch_fuzz 2
 
 Summary: Cross platform network backup for Linux, Unix, Mac and Windows
 Name: bacula
-Version: 2.0.3
-Release: 13%{?dist}
-License: GPL
+Version: 2.2.8
+Release: 2%{?dist}
+# See LICENSE for details
+License: GPLv2 with exceptions
 Group: System Environment/Daemons
 Source0: http://download.sourceforge.net/bacula/bacula-%{version}.tar.gz
-Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.gz
+Source1: http://download.sourceforge.net/bacula/bacula-docs-%{docs_version}.tar.bz2
 #Source2: http://download.sourceforge.net/bacula/bacula-rescue-%{rescue_version}.tar.gz
 Source3: bacula-gconsole.desktop
 Source4: bacula-wxconsole.desktop
@@ -25,14 +27,14 @@
 #Source11: bacula-web.apache
 Patch0: bacula-director-configuration.patch
 Patch1: bacula-config.patch
-Patch2: bacula-wxconsole.patch
+#Patch2: bacula-wxconsole.patch
 Patch3: bacula-pamd.patch
-Patch4: 2.0.3-ampm.patch
-Patch5: 2.0.3-maxbyteslist.patch
-Patch6: 2.0.3-maxwaittime.patch
-Patch7: 2.0.3-scheduler-next-hour.patch
-Patch8: 2.0.3-verify.patch
-Patch9: 2.0.3-tls-disconnect.patch
+#Patch4: 2.0.3-ampm.patch
+#Patch5: 2.0.3-maxbyteslist.patch
+#Patch6: 2.0.3-maxwaittime.patch
+#Patch7: 2.0.3-scheduler-next-hour.patch
+#Patch8: 2.0.3-verify.patch
+#Patch9: 2.0.3-tls-disconnect.patch
 #Patch10: bacula-web-smarty.patch
 URL: http://www.bacula.org
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -46,7 +48,7 @@
 BuildRequires: libacl-devel, latex2html, tetex-latex, tetex, ghostscript
 BuildRequires: dvipdfm
 
-%if "%{fedora}" >= "7"
+%if 0%{?fedora} >= 7
 BuildRequires: tcp_wrappers-devel
 %else
 BuildRequires: tcp_wrappers
@@ -67,7 +69,6 @@
 Provides: bacula-director = %{version}-%{release}
 Requires: bacula-director-common = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
-Requires: mysql-server
 
 %description director-mysql
 Bacula is a set of programs that allow you to manage the backup,
@@ -102,7 +103,6 @@
 Provides: bacula-director = %{version}-%{release}
 Requires: bacula-director-common = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
-Requires: postgresql-server
 
 %description director-postgresql
 Bacula is a set of programs that allow you to manage the backup,
@@ -174,7 +174,6 @@
 Provides: bacula-storage = %{version}-%{release}
 Requires: bacula-storage-common = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
-Requires: mysql-server
 
 %description storage-mysql
 Bacula is a set of programs that allow you to manage the backup,
@@ -209,7 +208,6 @@
 Provides: bacula-storage = %{version}-%{release}
 Requires: bacula-storage-common = %{version}-%{release}
 Requires: bacula-common = %{version}-%{release}
-Requires: postgresql-server
 
 %description storage-postgresql
 Bacula is a set of programs that allow you to manage the backup,
@@ -323,14 +321,14 @@
 pushd bacula-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
+#%patch2 -p1
 %patch3 -p1
-%patch4 -p0
-%patch5 -p0
-%patch6 -p0
-%patch7 -p0
-%patch8 -p0
-%patch9 -p0
+#%patch4 -p0
+#%patch5 -p0
+#%patch6 -p0
+#%patch7 -p0
+#%patch8 -p0
+#%patch9 -p0
 
 # Remove execution permissions from files we're packaging as docs later on
 find examples -type f | xargs chmod -x
@@ -380,7 +378,7 @@
 	--enable-conio \
 	--enable-largefile \
 	--enable-gnome \
-	--enable-wx-console \
+	--enable-bwx-console \
 	--enable-tray-monitor \
 	--enable-build-dird \
 	--enable-build-stored \
@@ -520,15 +518,15 @@
 # Fix some wrapper braindeadness
 rm -f %{buildroot}%{_libexecdir}/bacula/bconsole
 rm -f %{buildroot}%{_libexecdir}/bacula/gconsole
-mv %{buildroot}%{_sbindir}/wx-console %{buildroot}%{_sbindir}/wxconsole
-mv %{buildroot}%{_sysconfdir}/bacula/wx-console.conf %{buildroot}%{_sysconfdir}/bacula/wxconsole.conf
+mv %{buildroot}%{_sbindir}/bwx-console %{buildroot}%{_sbindir}/bwxconsole
+mv %{buildroot}%{_sysconfdir}/bacula/bwx-console.conf %{buildroot}%{_sysconfdir}/bacula/bwxconsole.conf
 
 
 # Desktop Integration for the console apps and the traymonitor
 mkdir -p %{buildroot}%{_bindir}
 install -m 644 -D bacula-sqlite/scripts/bacula.png %{buildroot}%{_datadir}/pixmaps/bacula.png
-install -m 644 -D bacula-sqlite/scripts/gnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/gnome-console
-install -m 644 -D bacula-sqlite/scripts/gnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/gnome-console
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bgnome-console
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.console_apps %{buildroot}%{_sysconfdir}/security/console.apps/bgnome-console
 install -m 644 -D bacula-sqlite/src/wx-console/wxwin16x16.xpm %{buildroot}%{_datadir}/pixmaps/wxwin16x16.xpm
 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
@@ -723,10 +721,10 @@
 
 
 %files common
+%defattr(-,root,root,-)
 %doc bacula-%{version}/AUTHORS bacula-%{version}/ChangeLog bacula-%{version}/COPYING bacula-%{version}/LICENSE
 %doc bacula-%{version}/README bacula-%{version}/SUPPORT bacula-%{version}/VERIFYING
 %doc bacula-%{version}/examples/
-%defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/logrotate.d/bacula
 %dir %{_sysconfdir}/bacula
 %dir %{_libexecdir}/bacula
@@ -752,18 +750,19 @@
 %files console
 %defattr(-,root,root,-)
 %{_sbindir}/bconsole
-%config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bconsole.conf
 %{_mandir}/man8/bconsole.8*
 
 
 %files console-gnome
 %defattr(-,root,root,-)
-%config %{_sysconfdir}/security/console.apps/gnome-console
-%config %{_sysconfdir}/pam.d/gnome-console
-%config(noreplace) %{_sysconfdir}/bacula/gnome-console.conf
+%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
-%{_sbindir}/gnome-console
-%{_mandir}/man1/bacula-console-gnome.1*
+%{_sbindir}/bgnome-console
+%{_mandir}/man1/bacula-bgnome-console.1.gz
+#%{_mandir}/man1/bacula-bconsole-gnome.1*
 %{_datadir}/applications/fedora-bacula-gconsole.desktop
 %{_datadir}/pixmaps/bacula.png
 
@@ -772,17 +771,17 @@
 %defattr(-,root,root,-)
 %config %{_sysconfdir}/security/console.apps/wxconsole
 %config %{_sysconfdir}/pam.d/wxconsole
-%config(noreplace) %{_sysconfdir}/bacula/wxconsole.conf
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bwxconsole.conf
 %{_bindir}/wxconsole
-%{_sbindir}/wxconsole
-%{_mandir}/man1/bacula-wxconsole.1*
+%{_sbindir}/bwxconsole
+%{_mandir}/man1/bacula-bwxconsole.1*
 %{_datadir}/applications/fedora-bacula-wxconsole.desktop
 %{_datadir}/pixmaps/wxwin16x16.xpm
 
 
 %files director-common
-%doc bacula-%{version}/updatedb/
 %defattr(-,root,root,-)
+%doc bacula-%{version}/updatedb/
 %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
 %config(noreplace) %{_sysconfdir}/bacula/query.sql
 %config %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
@@ -791,6 +790,7 @@
 %{_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
@@ -895,13 +895,14 @@
 %files traymonitor
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-tray-monitor
-%config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
+%attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/tray-monitor.conf
 %{_mandir}/man1/bacula-tray-monitor.1*
 %{_datadir}/applications/fedora-bacula-traymonitor.desktop
 %{_datadir}/pixmaps/bacula-tray-monitor.xpm
 
 
 %files docs
+%defattr(-,root,root,-)
 %doc bacula-docs-%{docs_version}/bacula-web/bacula-web.pdf
 %doc bacula-docs-%{docs_version}/bacula-web/bacula-web/
 %doc bacula-docs-%{docs_version}/developers/developers.pdf
@@ -921,6 +922,29 @@
 
 
 %changelog
+* Wed Jul 30 2008 Andreas Thienemann <athienem at redhat.com> - 2.2.8-2
+- Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide
+
+* Fri Jul 25 2008 Jon Ciesla <limb at jcomserv.net> - 2.2.8-1
+- Update to 2.2.8. BZ 446461.
+- Dropped director and storage DB-server hard Reqs. BZ 426788.
+- .desktop fixes.  BZ 450278, 426789.
+- Updated config patch.
+- Dropped wxconsole patch, applied upstream.
+- Updated pamd patch.
+- Dropped ampm patch, applied upstream.
+- Dropped maxbyteslist patch, N/A.
+- Dropped maxwaittime patch, applied upstream.
+- Dropped scheduler-next-hour patch, applied upstream.
+- Dropped verify patch, applied upstream.
+- Dropped tls-disconnect patch, applied upstream.
+- Fix for 426791.
+- Introduced patch fuzz workaround, will fix.
+
+* Mon Jul  7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-14
+- fix conditional comparison
+- fix license tag
+
 * Mon Jan 07 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 2.0.3-13
 - add BR: dvipdfm
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	24 Jul 2007 20:11:04 -0000	1.2
+++ sources	31 Jul 2008 12:18:40 -0000	1.3
@@ -1,2 +1,2 @@
-443d2560ace95173a0d8ba465de493ef  bacula-2.0.3.tar.gz
-dce3aed621b9e4abee51cc89aebf4a58  bacula-docs-2.0.3.tar.gz
+4547d0bf9f976d5d9ea5f21a7bd078ee  bacula-2.2.8.tar.gz
+9cc38ace92d52c7bebbbfc2ed5507b79  bacula-docs-2.2.8.tar.bz2