slaanesh pushed to bacula (f20). "Update for el5/el6/el7 rebuilds"

[notifications at fedoraproject.org]

From de6295915c40fa388e958a005a9eb32ffd07d59e Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17 at gmail.com>
Date: Fri, 15 May 2015 10:58:05 +0200
Subject: Update for el5/el6/el7 rebuilds


diff --git a/bacula.spec b/bacula.spec
index aaaca70..0fa82cb 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            5.2.13
-Release:            18%{?dist}
+Release:            19%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -133,7 +133,6 @@ Group:              System Environment/Daemons
 Requires:           bacula-common%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
 Requires:           bacula-libs-sql%{?_isa} = %{version}-%{release}
-Requires:           logwatch
 # Director backends merged into core.
 Provides:           bacula-director-common = %{version}-%{release}
 Obsoletes:          bacula-director-common < 5.2.3-5
@@ -164,6 +163,20 @@ based on a client/server architecture.
 
 This package contains the director files.
 
+%package logwatch
+Summary:            Bacula Director logwatch scripts
+Group:              System Environment/Daemons
+BuildArch:          noarch
+Requires:           bacula-director%{?_isa} = %{version}-%{release}
+Requires:           logwatch
+
+%description logwatch
+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 logwatch scripts for Bacula Director.
+
 %package storage
 Summary:            Bacula storage daemon files
 Group:              System Environment/Daemons
@@ -250,6 +263,7 @@ system.
 Summary:            Bacula bat console
 Group:              System Environment/Daemons
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
+Requires:           dejavu-lgc-sans-fonts
 
 %description console-bat
 Bacula is a set of programs that allow you to manage the backup, recovery, and
@@ -262,6 +276,7 @@ This package contains the bat version of the bacula management console.
 Summary:            Bacula system tray monitor
 Group:              System Environment/Daemons
 Requires:           bacula-libs%{?_isa} = %{version}-%{release}
+Requires:           dejavu-lgc-sans-fonts
 
 %description traymonitor
 Bacula is a set of programs that allow you to manage the backup, recovery, and
@@ -625,11 +640,7 @@ fi
 %doc updatedb examples/sample-query.sql
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf
 %attr(640,root,bacula) %config(noreplace) %{_sysconfdir}/bacula/query.sql
-%config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
-%config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
-%{_sysconfdir}/logwatch/scripts/services/bacula
-%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/bacula-dir.service
 %else
@@ -672,6 +683,13 @@ fi
 %{_libexecdir}/%{name}/make_postgresql_tables
 %{_libexecdir}/%{name}/update_postgresql_tables
 
+%files logwatch
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
+%config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf
+%{_sysconfdir}/logwatch/scripts/services/bacula
+%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
+
 %files storage
 %defattr(-,root,root,-)
 %{_sbindir}/bacula-sd
@@ -759,6 +777,15 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Fri May 15 2015 Simone Caronni <negativo17 at gmail.com> - 5.2.13-19
+- Require dejavu-lgc-sans-fonts for graphical programs. Fixes startup of bat on
+  headless servers without a desktop installed.
+- Split logwatch files in its own package. Logwatch should be installed
+  explicitly by an administrator, and not by defaul. Also, the current logwatch
+  package for RHEL 7 has a bug and can not be customized:
+  https://bugzilla.redhat.com/show_bug.cgi?id=1221903
+  Thanks to Dimitri Maziuk for reporting.
+
 * Tue Apr 01 2014 Simone Caronni <negativo17 at gmail.com> - 5.2.13-18
 - Add missing requirement for Nagios plugin folder.
 - Update queryfile patch.
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/bacula.git/commit/?h=f20&id=de6295915c40fa388e958a005a9eb32ffd07d59e