From a01e46b838699c0d2a13ec131863837b6cad0057 Mon Sep 17 00:00:00 2001
From: Davide Cavalca <dcavalca@fedoraproject.org>
Date: Tue, 10 Aug 2021 09:34:27 -0700
Subject: [PATCH] Split out logrotate config and dependency into a subpackage

---
 rsyslog.spec | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/rsyslog.spec b/rsyslog.spec
index 7918633..01a24f8 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -8,7 +8,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.2102.0
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: (GPLv3+ and ASL 2.0)
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
@@ -45,13 +45,18 @@ BuildRequires: zlib-devel
 BuildRequires: openssl-devel
 
 Requires: openssl-libs
-Requires: logrotate >= 3.5.2
+Recommends: %{name}-logrotate = %version-%release
 Requires: bash >= 2.0
 %{?systemd_ordering}
 
 Provides: syslog
 Obsoletes: sysklogd < 1.5-11
 
+%package logrotate
+Summary: Log rotation for rsyslog
+Requires: %name = %version-%release
+Requires: logrotate >= 3.5.2
+
 %package crypto
 Summary: Encryption support
 Requires: %name = %version-%release
@@ -185,6 +190,9 @@ and can be used as a drop-in replacement. Rsyslog is simple to set up, with
 advanced features suitable for enterprise-class, encryption-protected syslog
 relay chains.
 
+%description logrotate
+This subpackage contains the default logrotate configuration for rsyslog.
+
 %description crypto
 This package contains a module providing log file encryption and a
 command line tool to process encrypted logs.
@@ -458,7 +466,6 @@ done
 %{_unitdir}/rsyslog.service
 %config(noreplace) %{_sysconfdir}/rsyslog.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/rsyslog
-%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
 # plugins
 %{_libdir}/rsyslog/fmhash.so
 %{_libdir}/rsyslog/fmhttp.so
@@ -499,6 +506,9 @@ done
 %{_libdir}/rsyslog/omclickhouse.so
 %endif
 
+%files logrotate
+%config(noreplace) %{_sysconfdir}/logrotate.d/rsyslog
+
 %files crypto
 %{_bindir}/rscryutil
 %{_mandir}/man1/rscryutil.1.gz
@@ -583,6 +593,10 @@ done
 
 
 %changelog
+* Wed Oct 06 2021 Davide Cavalca <dcavalca@fedoraproject.org> - 8.2102.0-8
+- Split out logrotate config and dependency into a subpackage
+  resolves: rhbz#1992153
+
 * Wed Sep 15 2021 Attila Lakatos <alakatos@redhat.com> - 8.2102.0-7
 - Enable mmfields plugin