rpms/bacula/F-9 bacula-bat.desktop, 1.1, 1.2 bacula-bwxconsole.desktop, 1.1, 1.2 bacula-config.patch, 1.2, 1.3 bacula-director-configuration.patch, 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.logrotate, 1.2, 1.3 bacula.spec, 1.9, 1.10 sources, 1.3, 1.4
Jon Ciesla
limb at fedoraproject.org
Tue Jan 6 15:47:46 UTC 2009
- Previous message: rpms/evolution-exchange/devel .cvsignore, 1.34, 1.35 evolution-exchange.spec, 1.47, 1.48 sources, 1.34, 1.35
- Next message: rpms/eigen2/F-10 .cvsignore, 1.5, 1.6 eigen2.spec, 1.4, 1.5 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: limb
Update of /cvs/pkgs/rpms/bacula/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18164
Modified Files:
bacula-bat.desktop bacula-bwxconsole.desktop
bacula-config.patch bacula-director-configuration.patch
bacula-gconsole.desktop bacula-traymonitor.desktop
bacula-wxconsole.desktop bacula.logrotate bacula.spec sources
Log Message:
Update to 2.4.4., multiple upstream and packaging fixes.
Index: bacula-bat.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-bat.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-bat.desktop 31 Jul 2008 12:18:40 -0000 1.1
+++ bacula-bat.desktop 6 Jan 2009 15:47:15 -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/F-9/bacula-bwxconsole.desktop,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-bwxconsole.desktop 31 Jul 2008 12:18:40 -0000 1.1
+++ bacula-bwxconsole.desktop 6 Jan 2009 15:47:15 -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
bacula-config.patch:
Index: bacula-config.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-config.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-config.patch 31 Jul 2008 12:18:40 -0000 1.2
+++ bacula-config.patch 6 Jan 2009 15:47:15 -0000 1.3
@@ -1,256 +1,122 @@
---- 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 @@
- #
-
- Director {
+--- bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in.orig 2008-12-10 10:12:18.000000000 -0600
++++ bacula-2.4.3/src/gnome2-console/bgnome-console.conf.in 2008-12-10 10:12:18.000000000 -0600
+@@ -6 +6 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
+ address = server.example.com
- Password = "@dir_password@"
- }
-
---- bacula-2.0.2/src/dird/bacula-dir.conf.in.orig 2007-02-06 13:33:19.000000000 +0100
-+++ bacula-2.0.2/src/dird/bacula-dir.conf.in 2007-02-06 13:34:49.000000000 +0100
-@@ -13,7 +13,7 @@
- #
-
- Director { # define myself
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 10:17:27.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 10:17:27.000000000 -0600
+@@ -16 +16 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@ # where we listen for UA connections
- QueryFile = "@scriptdir@/query.sql"
- WorkingDirectory = "@working_dir@"
-@@ -27,7 +27,7 @@
- Name = "DefaultJob"
- Type = Backup
- Level = Incremental
+@@ -30 +30 @@
- Client = @hostname at -fd
+ Client = bacula-fd
- FileSet = "Full Set"
- Schedule = "WeeklyCycle"
- Storage = File
-@@ -48,7 +48,7 @@
-
- #Job {
- # Name = "Client2"
+@@ -51 +51 @@
-# Client = @hostname at 2-fd
+# Client = bacula2-fd
- # JobDefs = "DefaultJob"
- # Write Bootstrap = "@working_dir@/Client2.bsr"
- #}
-@@ -75,7 +75,7 @@
- Job {
- Name = "RestoreFiles"
- Type = Restore
+@@ -82 +82 @@
- Client=@hostname at -fd
+ Client=bacula-fd
- FileSet="Full Set"
- Storage = File
- Pool = Default
-@@ -149,8 +149,8 @@
-
- # Client (File Services) to backup
- Client {
+@@ -157,2 +157,2 @@
- Name = @hostname at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
- FDPort = @fd_port@
- Catalog = MyCatalog
- Password = "@fd_password@" # password for FileDaemon
-@@ -164,8 +164,8 @@
- # You should change Name, Address, and Password before using
- #
- #Client {
+@@ -172,2 +172,2 @@
-# Name = @hostname at 2-fd
-# Address = @hostname at 2
+# Name = bacula2-fd
+# Address = client2.example.com
- # FDPort = @fd_port@
- # Catalog = MyCatalog
- # Password = "@fd_password at 2" # password for FileDaemon 2
-@@ -179,7 +179,7 @@
- Storage {
- Name = File
- # Do not use "localhost" here
+@@ -187 +187 @@
- Address = @hostname@ # N.B. Use a fully qualified name here
-+ Address = storage.example.com # N.B. Use a fully qualified name here
- SDPort = @sd_port@
- Password = "@sd_password@"
- Device = FileStorage
-@@ -192,7 +192,7 @@
- #Storage {
- # Name = DDS-4
- # Do not use "localhost" here
++ Address = storage.example.com # N.B. Use a fully qualified name here
+@@ -200 +200 @@
-# Address = @hostname@ # N.B. Use a fully qualified name here
-+# Address = storage.example.com # N.B. Use a fully qualified name here
- # SDPort = @sd_port@
- # Password = "@sd_password@" # password for Storage daemon
- # Device = DDS-4 # must be same as Device in Storage daemon
-@@ -204,7 +204,7 @@
- #Storage {
- # Name = "8mmDrive"
- # Do not use "localhost" here
++# Address = storage.example.com # N.B. Use a fully qualified name here
+@@ -212 +212 @@
-# Address = @hostname@ # N.B. Use a fully qualified name here
-+# Address = storage.example.com # N.B. Use a fully qualified name here
- # SDPort = @sd_port@
- # Password = "@sd_password@"
- # Device = "Exabyte 8mm"
-@@ -215,7 +215,7 @@
- #Storage {
- # Name = "DVD"
- # Do not use "localhost" here
++# Address = storage.example.com # N.B. Use a fully qualified name here
+@@ -223 +223 @@
-# Address = @hostname@ # N.B. Use a fully qualified name here
-+# Address = storage.example.com # N.B. Use a fully qualified name here
- # SDPort = @sd_port@
- # Password = "@sd_password@"
- # Device = "DVD Writer"
-@@ -285,7 +285,7 @@
- # Restricted console used by tray-monitor to get the status of the director
- #
- Console {
++# Address = storage.example.com # N.B. Use a fully qualified name here
+@@ -299 +299 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_dir_password@"
- CommandACL = status, .status
- }
---- bacula-2.0.2/src/filed/bacula-fd.conf.in.orig 2007-02-06 13:30:59.000000000 +0100
-+++ bacula-2.0.2/src/filed/bacula-fd.conf.in 2007-02-06 13:31:25.000000000 +0100
-@@ -11,7 +11,7 @@
- # List Directors who are permitted to contact this File daemon
- #
- Director {
+--- bacula-2.4.3/src/filed/bacula-fd.conf.in.orig 2008-12-10 10:19:12.000000000 -0600
++++ bacula-2.4.3/src/filed/bacula-fd.conf.in 2008-12-10 10:19:12.000000000 -0600
+@@ -14 +14 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- Password = "@fd_password@"
- }
-
-@@ -20,7 +20,7 @@
- # status of the file daemon
- #
- Director {
+@@ -23 +23 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_fd_password@"
- Monitor = yes
- }
-@@ -29,7 +29,7 @@
- # "Global" File daemon configuration specifications
- #
- FileDaemon { # this is me
+@@ -32 +32 @@
- Name = @hostname at -fd
+ Name = bacula-fd
- FDport = @fd_port@ # where we listen for the director
- WorkingDirectory = @working_dir@
- Pid Directory = @piddir@
-@@ -39,5 +39,5 @@
- # Send all messages except skipped files back to Director
- Messages {
- Name = Standard
+@@ -42 +42 @@
- director = @hostname at -dir = all, !skipped, !restored
+ director = bacula-dir = all, !skipped, !restored
- }
---- bacula-2.0.2/src/console/bconsole.conf.in.orig 2007-02-06 13:32:30.000000000 +0100
-+++ bacula-2.0.2/src/console/bconsole.conf.in 2007-02-06 13:33:06.000000000 +0100
-@@ -3,8 +3,8 @@
- #
-
- Director {
-- Name = @hostname at -dir
-+ Name = bacula-dir
- DIRport = @dir_port@
-- address = @hostname@
-+ address = server.example.com
- Password = "@dir_password@"
- }
---- bacula-2.0.2/src/stored/bacula-sd.conf.in.orig 2007-02-06 13:31:56.000000000 +0100
-+++ bacula-2.0.2/src/stored/bacula-sd.conf.in 2007-02-06 13:32:15.000000000 +0100
-@@ -11,7 +11,7 @@
- #
-
- Storage { # definition of myself
+--- bacula-2.4.3/src/stored/bacula-sd.conf.in.orig 2008-12-10 10:21:45.000000000 -0600
++++ bacula-2.4.3/src/stored/bacula-sd.conf.in 2008-12-10 10:21:45.000000000 -0600
+@@ -14 +14 @@
- Name = @hostname at -sd
+ Name = bacula-sd
- SDPort = @sd_port@ # Director's port
- WorkingDirectory = "@working_dir@"
- Pid Directory = "@piddir@"
-@@ -22,7 +22,7 @@
- # List Directors who are permitted to contact Storage daemon
- #
- Director {
+@@ -25 +25 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- Password = "@sd_password@"
- }
-
-@@ -31,7 +31,7 @@
- # status of the storage daemon
- #
- Director {
+@@ -34 +34 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_sd_password@"
- Monitor = yes
- }
-@@ -204,5 +204,5 @@
- #
- Messages {
- Name = Standard
+@@ -228 +228 @@
- director = @hostname at -dir = all
+ director = bacula-dir = all
- }
---- 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 @@
- #
-
- Director {
+--- bacula-2.4.3/src/wx-console/bwx-console.conf.in.orig 2008-12-10 10:22:23.000000000 -0600
++++ bacula-2.4.3/src/wx-console/bwx-console.conf.in 2008-12-10 10:22:23.000000000 -0600
+@@ -6 +6 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
+ address = server.example.com
- Password = "@dir_password@"
- }
---- bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in.orig 2007-02-06 13:47:13.000000000 +0100
-+++ bacula-2.0.2/src/tray-monitor/tray-monitor.conf.in 2007-02-06 13:47:55.000000000 +0100
-@@ -3,27 +3,27 @@
- #
-
- Monitor {
+--- bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in.orig 2008-12-10 10:28:02.000000000 -0600
++++ bacula-2.4.3/src/tray-monitor/tray-monitor.conf.in 2008-12-10 10:28:02.000000000 -0600
+@@ -6 +6 @@
- Name = @hostname at -mon
+ Name = bacula-mon
- Password = "@mon_dir_password@" # password for the Directors
- RefreshInterval = 5 seconds
- }
-
- Client {
+@@ -12,2 +12,2 @@
- Name = @hostname at -fd
- Address = @hostname@
+ Name = bacula-fd
+ Address = client.example.com
- FDPort = @fd_port@
- Password = "@mon_fd_password@" # password for FileDaemon
- }
-
- Storage {
+@@ -19,2 +19,2 @@
- Name = @hostname at -sd
- Address = @hostname@
+ Name = bacula-sd
+ Address = storage.example.com
- SDPort = @sd_port@
- Password = "@mon_sd_password@" # password for StorageDaemon
- }
-
- Director {
+@@ -26 +26 @@
+- Name = @hostname at -dir
++ Name = bacula-dir
+@@ -28 +27,0 @@
+- address = @hostname@
+--- bacula-2.4.3/src/qt-console/bat.conf.in.orig 2008-12-10 10:27:02.000000000 -0600
++++ bacula-2.4.3/src/qt-console/bat.conf.in 2008-12-10 10:27:02.000000000 -0600
+@@ -6 +6 @@
- Name = @hostname at -dir
+ Name = bacula-dir
- DIRport = @dir_port@
+@@ -8 +8 @@
- address = @hostname@
--}
-\ No newline at end of file
+ address = server.example.com
-+}
+--- bacula-2.4.3/src/stored/stored.conf.in.orig 2008-12-10 10:27:44.000000000 -0600
++++ bacula-2.4.3/src/stored/stored.conf.in 2008-12-10 10:27:44.000000000 -0600
+@@ -11 +11 @@
+- Address = @hostname@
++ Address = storage.example.com
+@@ -22 +22 @@
+- Name = @hostname at -dir
++ Name = bacula-dir
+@@ -54 +54 @@
+- director = @hostname at -dir = all
++ director = bacula-dir = all
bacula-director-configuration.patch:
Index: bacula-director-configuration.patch
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-director-configuration.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- bacula-director-configuration.patch 24 Jul 2007 20:11:04 -0000 1.1
+++ bacula-director-configuration.patch 6 Jan 2009 15:47:15 -0000 1.2
@@ -1,34 +1,17 @@
---- bacula-1.38.11/src/dird/bacula-dir.conf.in.orig 2006-09-03 03:13:26.000000000 +0200
-+++ bacula-1.38.11/src/dird/bacula-dir.conf.in 2006-09-03 03:14:46.000000000 +0200
-@@ -15,7 +15,7 @@
- Director { # define myself
- Name = @hostname at -dir
- DIRport = @dir_port@ # where we listen for UA connections
+--- bacula-2.4.3/src/dird/bacula-dir.conf.in.orig 2008-12-10 08:59:18.000000000 -0600
++++ bacula-2.4.3/src/dird/bacula-dir.conf.in 2008-12-10 08:59:18.000000000 -0600
+@@ -18 +18 @@
- QueryFile = "@scriptdir@/query.sql"
+ QueryFile = "/etc/bacula/query.sql"
- WorkingDirectory = "@working_dir@"
- PidDirectory = "@piddir@"
- Maximum Concurrent Jobs = 1
-@@ -101,11 +101,10 @@
- # if you have other partitons such as /usr or /home
- # you will probably want to add them too.
- #
+@@ -108,3 +108,2 @@
-# By default this is defined to point to the Bacula build
-# directory to give a reasonable FileSet to backup to
-# disk storage during initial testing.
+# This File-directive would backup your whole filesystem.
+# It is disabled by default
- #
+@@ -112 +111 @@
- File = @BUILD_DIR@
-+# File = /
- }
-
- #
-@@ -266,7 +266,7 @@
- mailcommand = "@sbindir@/bsmtp -h @smtp_host@ -f \"\(Bacula\) %r\" -s \"Bacula daemon message\" %r"
- mail = @job_email@ = all, !skipped
- console = all, !skipped, !saved
++ File = /
+@@ -263 +262 @@
- append = "@working_dir@/log" = all, !skipped
+ append = "/var/log/bacula.log" = all, !skipped
- }
-
Index: bacula-gconsole.desktop
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula-gconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-gconsole.desktop 31 Jul 2008 12:18:40 -0000 1.2
+++ bacula-gconsole.desktop 6 Jan 2009 15:47:15 -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/F-9/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 6 Jan 2009 15:47:15 -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/F-9/bacula-wxconsole.desktop,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula-wxconsole.desktop 31 Jul 2008 12:18:40 -0000 1.2
+++ bacula-wxconsole.desktop 6 Jan 2009 15:47:15 -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.logrotate
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.logrotate,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- bacula.logrotate 29 Aug 2008 17:25:48 -0000 1.2
+++ bacula.logrotate 6 Jan 2009 15:47:15 -0000 1.3
@@ -1,6 +1,6 @@
# Bacula logrotate script
-/var/log/bacula/*.log /var/spool/bacula/log {
+/var/log/bacula/*.log /var/spool/bacula/log /var/log/bacula.log {
monthly
rotate 4
notifempty
Index: bacula.spec
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/bacula.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- bacula.spec 10 Sep 2008 15:39:05 -0000 1.9
+++ bacula.spec 6 Jan 2009 15:47:15 -0000 1.10
@@ -4,12 +4,11 @@
%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.2.8
-Release: 3%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
# See LICENSE for details
License: GPLv2 with exceptions
Group: System Environment/Daemons
@@ -25,6 +24,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
@@ -36,6 +36,8 @@
#Patch8: 2.0.3-verify.patch
#Patch9: 2.0.3-tls-disconnect.patch
#Patch10: bacula-web-smarty.patch
+#Patch11: bacula-2.4.3-orphaned-jobs.patch
+#Patch12: bacula-2.4.3-python26.patch
URL: http://www.bacula.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: openssl-devel, atk-devel, ncurses-devel, pango-devel, perl
@@ -46,7 +48,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
@@ -119,6 +121,7 @@
Group: System Environment/Daemons
Requires: bacula-director = %{version}-%{release}
Requires: bacula-common = %{version}-%{release}
+Requires: logwatch
Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt
@@ -222,6 +225,7 @@
%package common
Summary: Common Bacula utilities
Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
Requires(pre): fedora-usermgmt
Requires(postun): fedora-usermgmt
@@ -234,6 +238,7 @@
%package console
Summary: Bacula management console
Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
%description console
Bacula is a set of programs that allow you to manage the backup,
@@ -247,6 +252,7 @@
%package console-gnome
Summary: Bacula console for the Gnome desktop environment
Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
Requires: usermode
%description console-gnome
@@ -256,10 +262,24 @@
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: 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
Group: System Environment/Daemons
+Requires: bacula-sysconfdir = %{version}-%{release}
Requires: usermode
%description console-wxwidgets
@@ -271,6 +291,18 @@
console.
+%package sysconfdir
+Summary: /etc/bacula dependency for Bacula
+Group: System Environment/Daemons
+
+%description sysconfdir
+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 provides the /etc/bacula directory in order to satisfy
+certain scripted checks.
+
%package traymonitor
Summary: Bacula monitor for the Gnome and KDE system tray
Group: System Environment/Daemons
@@ -329,6 +361,8 @@
#%patch7 -p0
#%patch8 -p0
#%patch9 -p0
+#%patch11 -p0
+#%patch12 -p0
# Remove execution permissions from files we're packaging as docs later on
find examples -type f | xargs chmod -x
@@ -387,6 +421,8 @@
--with-python \
--enable-smartalloc \
--with-x \
+ --enable-bat \
+ --with-qwt=/usr/lib \
$*
# Scratch this, it is trouble
# --with-readline \
@@ -530,14 +566,22 @@
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
+#bat.pamd is broken.
+install -m 644 -D bacula-sqlite/scripts/bgnome-console.pamd %{buildroot}%{_sysconfdir}/pam.d/bat
+install -m 644 -D bacula-sqlite/scripts/bat.desktop.consolehelper %{buildroot}%{_sysconfdir}/security/console.apps/bat
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
@@ -624,11 +668,13 @@
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.mysql
fi
+
%preun director-sqlite
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.sqlite
fi
+
%preun director-postgresql
if [ "$1" = 0 ]; then
/usr/sbin/alternatives --remove bacula-dir /usr/sbin/bacula-dir.postgresql
@@ -680,7 +726,7 @@
%preun client
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
/sbin/service bacula-fd stop >/dev/null 2>&1 || :
/sbin/chkconfig --del bacula-fd
fi
@@ -697,7 +743,7 @@
%preun director-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
/sbin/service bacula-dir stop >/dev/null 2>&1 || :
/sbin/chkconfig --del bacula-dir
fi
@@ -714,7 +760,7 @@
%preun storage-common
-if [ $1 = 0 ]; then
+if [ "$1" = 0 ]; then
/sbin/service bacula-sd stop >/dev/null 2>&1 || :
/sbin/chkconfig --del bacula-sd
fi
@@ -726,13 +772,19 @@
fi
+# For this braindeadness, please see
+# https://bugzilla.redhat.com/show_bug.cgi?id=473627
+%files sysconfdir
+%defattr(-,root,root,-)
+%dir %{_sysconfdir}/bacula
+
+
%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/
%config(noreplace) %{_sysconfdir}/logrotate.d/bacula
-%dir %{_sysconfdir}/bacula
%dir %{_libexecdir}/bacula
%{_sbindir}/bsmtp
%{_sbindir}/btraceback
@@ -772,6 +824,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,-)
@@ -796,7 +859,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
@@ -928,10 +990,39 @@
%changelog
-* Wed Sep 10 2008 Jon Ciesla <limb at jcomserv.net> - 2.2.8-3
+* Mon Jan 05 2009 Jon Ciesla <limb at jcomserv.net - 2.4.4-1
+- Update to new upstream, 2.4.4.
+- Dropped orphaned jobs patch, python 2.6 patch, applied upstream.
+
+* Mon Dec 15 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-7
+- Patched to support Python 2.6, BZ 476547.
+
+* Fri Dec 12 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-6
+- Fix consolehelper behaviour for bat.
+
+* Wed Dec 10 2008 Jon Ciesla <limb at jcomserv.net - 2.4.3-5
+- Re-diffed fuzzy bacula-director-configuration and bacula-config patches.
+
+* Mon Dec 1 2008 Andreas Thienemann <andreas at bawue.net> - 2.4.3-4
+- Fixed dependency "issues" #473627 by adding the sysconfdir subpackage.
+
+* Mon Nov 17 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.3-3
+- Added upstream orphaned jobs patch.
+- Fixed logrotate file.
+
+* 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.
+
+* Tue Sep 09 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-2
- Logrotate fix. BZ 457894.
- Alternatives fix. BZ 458432.
+* Thu Jul 31 2008 Jon Ciesla <limb at jcomserv.net> - 2.4.2-1
+- Update to 2.4.2.
+
* Wed Jul 30 2008 Andreas Thienemann <athienem at redhat.com> - 2.2.8-2
- Fixed %%{fedora} comparision, making bacula-sqlite build on rawhide
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/bacula/F-9/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 31 Jul 2008 12:18:40 -0000 1.3
+++ sources 6 Jan 2009 15:47:16 -0000 1.4
@@ -1,2 +1,2 @@
-4547d0bf9f976d5d9ea5f21a7bd078ee bacula-2.2.8.tar.gz
-9cc38ace92d52c7bebbbfc2ed5507b79 bacula-docs-2.2.8.tar.bz2
+4eb6155b45611018af03002d37a2ffde bacula-2.4.4.tar.gz
+d9bb3e8ca8c9a4c741b83569c21a4806 bacula-docs-2.4.4.tar.bz2
- Previous message: rpms/evolution-exchange/devel .cvsignore, 1.34, 1.35 evolution-exchange.spec, 1.47, 1.48 sources, 1.34, 1.35
- Next message: rpms/eigen2/F-10 .cvsignore, 1.5, 1.6 eigen2.spec, 1.4, 1.5 sources, 1.5, 1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list