From fa55d6c3ada82cdaee64c66c701c954a6959579a Mon Sep 17 00:00:00 2001
From: Jan Macku <jamacku@redhat.com>
Date: Thu, 18 Dec 2025 15:07:13 +0100
Subject: [PATCH] Fix man page to mention usage of systemd timers

Resolves: RHEL-109481
---
 002-man-add-note-about-systemd-timer.patch | 30 ++++++++++++++++++++++
 logrotate.spec                             |  8 +++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 002-man-add-note-about-systemd-timer.patch

diff --git a/002-man-add-note-about-systemd-timer.patch b/002-man-add-note-about-systemd-timer.patch
new file mode 100644
index 0000000..37123bc
--- /dev/null
+++ b/002-man-add-note-about-systemd-timer.patch
@@ -0,0 +1,30 @@
+From 1c1feebaddfd7c736cf08409f404fbeb6d499ede Mon Sep 17 00:00:00 2001
+From: Jan Macku <jamacku@redhat.com>
+Date: Fri, 12 Dec 2025 14:40:48 +0100
+Subject: [PATCH] man: add note about systemd timer
+
+Update description to make it more clear that logrotate uses systemd timers
+when using systemd.
+
+(cherry picked from commit 6293cffe9a5166cb8053d1f3814e8c47a78f9868)
+---
+ logrotate.8.in | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/logrotate.8.in b/logrotate.8.in
+index 4ff198e..4577d83 100644
+--- a/logrotate.8.in
++++ b/logrotate.8.in
+@@ -36,7 +36,8 @@ large numbers of log files.  It allows automatic rotation, compression,
+ removal, and mailing of log files.  Each log file may be handled daily,
+ weekly, monthly, or when it grows too large.
+ .P
+-Normally, \fBlogrotate\fR is run as a daily cron job.  It will not modify
++Normally, \fBlogrotate\fR is run as a daily cron job (or by
++\fIlogrotate.timer\fR when using \fBsystemd\fR(1)).  It will not modify
+ a log more than once in one day unless the criterion for that log is
+ based on the log's size and \fBlogrotate\fR is being run more than once
+ each day, or unless the \fB\-f\fR or \fB\-\-force\fR option is used.
+-- 
+2.52.0
+
diff --git a/logrotate.spec b/logrotate.spec
index b0a18bc..9b7fa1a 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.22.0
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPL-2.0-or-later
 URL: https://github.com/logrotate/logrotate
 Source0: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
@@ -16,6 +16,9 @@ Source3: rwtab
 # https://github.com/logrotate/logrotate/pull/633
 Patch001: 001-Avoid-opening-log-file-for-getting-SELinux-context.patch
 
+# https://github.com/logrotate/logrotate/pull/690
+Patch002: 002-man-add-note-about-systemd-timer.patch
+
 BuildRequires: acl
 BuildRequires: automake
 BuildRequires: gcc
@@ -118,6 +121,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rwtab.d/logrotate
 
 %changelog
+* Thu Dec 18 2025 Jan Macku <jamacku@redhat.com> - 3.22.0-5
+- Fix man page to mention usage of systemd timers (RHEL-109481)
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 3.22.0-4
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018