From ac471f255849d9262a46f37c0091f66448dc8c52 Mon Sep 17 00:00:00 2001
From: Kamil Dudka <kdudka@redhat.com>
Date: Fri, 10 Aug 2018 12:25:38 +0200
Subject: [PATCH] Resolves: #1611498 - document the --version option in the
 logrotate(8) man page

---
 0001-logrotate-3.14.0-man-version.patch | 34 +++++++++++++++++++++++++
 logrotate.spec                          | 10 ++++++--
 2 files changed, 42 insertions(+), 2 deletions(-)
 create mode 100644 0001-logrotate-3.14.0-man-version.patch

diff --git a/0001-logrotate-3.14.0-man-version.patch b/0001-logrotate-3.14.0-man-version.patch
new file mode 100644
index 0000000..726ed2a
--- /dev/null
+++ b/0001-logrotate-3.14.0-man-version.patch
@@ -0,0 +1,34 @@
+From b0d067cfba64956893fc095bb37f8c767f5a910e Mon Sep 17 00:00:00 2001
+From: Kamil Dudka <kdudka@redhat.com>
+Date: Mon, 6 Aug 2018 17:13:31 +0200
+Subject: [PATCH] logrotate.8: document the --version option
+
+The man page now covers all the options that are listed
+by `logrotate --help`.
+
+Bug: https://bugzilla.redhat.com/1611498
+
+Upstream-commit: 4088ef987df2ec48cc3d968eb87ad27c840fa2d8
+Signed-off-by: Kamil Dudka <kdudka@redhat.com>
+---
+ logrotate.8.in | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/logrotate.8.in b/logrotate.8.in
+index 004229e..5ef09c5 100644
+--- a/logrotate.8.in
++++ b/logrotate.8.in
+@@ -87,6 +87,10 @@ Prints a short usage message.
+ \fB\-v\fR, \fB\-\-verbose\fR
+ Turns on verbose mode, for example to display messages during rotation.
+ 
++.TP
++\fB\-\-version\fR
++Display version information.
++
+ .SH CONFIGURATION FILE
+ 
+ \fBlogrotate\fR reads everything about the log files it should be handling
+-- 
+2.17.1
+
diff --git a/logrotate.spec b/logrotate.spec
index 821bdbd..552299d 100644
--- a/logrotate.spec
+++ b/logrotate.spec
@@ -1,7 +1,7 @@
 Summary: Rotates, compresses, removes and mails system log files
 Name: logrotate
 Version: 3.14.0
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Url: https://github.com/logrotate/logrotate
 Source: https://github.com/logrotate/logrotate/releases/download/%{version}/logrotate-%{version}.tar.xz
@@ -16,6 +16,9 @@ BuildRequires: libselinux-devel
 BuildRequires: popt-devel
 Requires: coreutils
 
+# document the --version option in the logrotate(8) man page (#1611498)
+Patch1:   0001-logrotate-3.14.0-man-version.patch
+
 %description
 The logrotate utility is designed to simplify the administration of
 log files on a system which generates a lot of log files.  Logrotate
@@ -47,7 +50,7 @@ git commit -m "configure.ac: compatibility fixes for RHEL-6"
 %endif
 
 autoreconf -fiv
-git add configure config.{guess,sub} Makefile.in install-sh
+git add --all
 git commit -m "force autoreconf" --allow-empty
 
 %build
@@ -101,6 +104,9 @@ fi
 %config(noreplace) %{_sysconfdir}/rwtab.d/logrotate
 
 %changelog
+* Fri Aug 10 2018 Kamil Dudka <kdudka@redhat.com> - 3.14.0-4
+- document the --version option in the logrotate(8) man page (#1611498)
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 3.14.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild