Merge branch 'master' into f17

README.Fedora

@@ -34,7 +34,6 @@ There are 3 programs which provide 'libbaccats.so'.
 
 Enter to keep the current selection[+], or type selection number: 1
 
-
 ======== Quick installation guide with the default PostgreSQL backend
 
 Perform the following commands to install Bacula with its default configuration
@@ -83,10 +82,16 @@ $ ./grant_bacula_privileges
 # systemctl start bacula-fd.service
 # echo status bacula-fd | bconsole
 
-5) Install the docs and read them!!
+5) Install the docs and read them
 
 # yum -y install bacula-docs
 
+6) If you don't backup to disk and have a tape library or autochanger, please
+also install the magnetic tapes commands:
+
+# yum -y install mt-st mtx
+
+
 ======== Bugs
 
 Please file bugs against the appropriate component using the Fedora version.

bacula-sd.sysconfig.el5

@@ -0,0 +1,9 @@
+# Users for bacula storage
+# If no user is set bacula will run as root
+
+SD_USER=bacula
+SD_GROUP=disk
+
+# Useful for debugging
+#
+# OPTS="-d 200"

bacula.spec

@@ -3,7 +3,7 @@
 
 Name:                   bacula
 Version:                5.2.7
-Release:                3%{?dist}
+Release:                4%{?dist}
 Summary:                Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:                AGPLv3 with exceptions
@@ -25,7 +25,8 @@ Source14:               bacula-traymonitor.desktop
 Source15:               bacula-fd.sysconfig
 Source16:               bacula-dir.sysconfig
 Source17:               bacula-sd.sysconfig
-Source18:               bacula-checkconf
+Source18:               bacula-sd.sysconfig.el5
+Source19:               bacula-checkconf
 
 Patch1:                 bacula-5.0.2-openssl.patch
 Patch2:                 bacula-5.2.2-queryfile.patch
@@ -408,7 +409,7 @@ install -p -m 755 -D scripts/logwatch/applybaculadate %{buildroot}%{_sysconfdir}
 install -p -m 644 -D scripts/logwatch/logfile.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
 install -p -m 644 -D scripts/logwatch/services.bacula.conf %{buildroot}%{_sysconfdir}/logwatch/conf/services/bacula.conf
 
-install -p -m 755 -D %{SOURCE18}  %{buildroot}%{_sbindir}/bacula-checkconf
+install -p -m 755 -D %{SOURCE19}  %{buildroot}%{_sbindir}/bacula-checkconf
 %if 0%{?fedora} >= 15 || 0%{?rhel} > 6
 # Systemd unit files
 mkdir -p %{buildroot}%{_unitdir}
@@ -425,7 +426,11 @@ install -p -m 755 -D %{SOURCE9} %{buildroot}%{_initrddir}/bacula-sd
 # Sysconfig
 install -p -m 644 -D %{SOURCE15} %{buildroot}%{_sysconfdir}/sysconfig/bacula-fd
 install -p -m 644 -D %{SOURCE16} %{buildroot}%{_sysconfdir}/sysconfig/bacula-dir
+%if 0%{?fedora} || 0%{?rhel} >= 6
 install -p -m 644 -D %{SOURCE17} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
+%else
+install -p -m 644 -D %{SOURCE18} %{buildroot}%{_sysconfdir}/sysconfig/bacula-sd
+%endif
 
 # Spool directory
 mkdir -p %{buildroot}%{_localstatedir}/spool/bacula
@@ -828,6 +833,11 @@ fi
 
 
 %changelog
+* Fri Jun 08 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-4
+- Make a note about mt-st and mtx (bz#829888).
+- Update README.Fedora with current information.
+- Fix bacula-sd group on Fedora and RHEL >= 6 (bz#829509).
+
 * Wed Jun 06 2012 Simone Caronni <negativo17@gmail.com> - 5.2.7-3
 - Final xattr patch from upstream for bz#819158.
 - Switch alternatives to point to the unversioned system libraries.