From 1fabaac9b062998e6497cdd073a432ab8753c554 Mon Sep 17 00:00:00 2001
From: Simone Caronni <negativo17@gmail.com>
Date: Fri, 15 May 2015 10:27:39 +0200
Subject: [PATCH] Split out logwatch scripts

---
 bacula.spec | 35 +++++++++++++++++++++++++++++------
 1 file changed, 29 insertions(+), 6 deletions(-)

diff --git a/bacula.spec b/bacula.spec
index 3c2c553..38a01ad 100644
--- a/bacula.spec
+++ b/bacula.spec
@@ -3,7 +3,7 @@
 
 Name:               bacula
 Version:            7.0.5
-Release:            6%{?dist}
+Release:            7%{?dist}
 Summary:            Cross platform network backup for Linux, Unix, Mac and Windows
 # See LICENSE for details
 License:            AGPLv3 with exceptions
@@ -138,7 +138,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
@@ -169,6 +168,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
@@ -623,8 +636,6 @@ fi
 %doc updatedb examples/sample-query.sql
 %config(noreplace) %{_sysconfdir}/bacula/bacula-dir.conf %attr(640,root,bacula)
 %config(noreplace) %{_sysconfdir}/bacula/query.sql %attr(640,root,bacula)
-%config(noreplace) %{_sysconfdir}/logwatch/conf/logfiles/bacula.conf
-%config(noreplace) %{_sysconfdir}/logwatch/conf/services/bacula.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/bacula-dir
 %{_libexecdir}/%{name}/create_bacula_database
 %{_libexecdir}/%{name}/delete_catalog_backup
@@ -662,14 +673,19 @@ fi
 %{_sbindir}/bsmtp
 %{_sbindir}/bwild
 %{_sbindir}/dbcheck
-%{_sysconfdir}/logwatch/scripts/services/bacula
-%{_sysconfdir}/logwatch/scripts/shared/applybaculadate
 %if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/bacula-dir.service
 %else
 %{_initrddir}/bacula-dir
 %endif
 
+%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,-)
 %config(noreplace) %{_sysconfdir}/bacula/bacula-sd.conf %attr(640,root,root)
@@ -749,6 +765,13 @@ fi
 %{_libdir}/nagios/plugins/check_bacula
 
 %changelog
+* Fri May 15 2015 Simone Caronni <negativo17@gmail.com> - 7.0.5-7
+- 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 May 12 2015 Simone Caronni <negativo17@gmail.com> - 7.0.5-6
 - Require dejavu-lgc-sans-fonts for graphical programs. Fixes startup of bat on
   headless servers without a desktop installed.