From a9dfa82cd8db980f1642c15b71aa5738b4c7a4b7 Mon Sep 17 00:00:00 2001
From: Jiri Vymazal <jvymazal@redhat.com>
Date: Wed, 1 Mar 2017 15:45:57 +0100
Subject: [PATCH] * Wed Mar 01 2017 Jiri Vymazal <jvymazal@redhat.com> -
 8.25.0-2 - rebased doc subpackage to 8.25.0 as well - dropped upstreamed doc
 patch

---
 .gitignore                          |  1 +
 rsyslog-8.24.0-recover_qi-doc.patch | 27 ---------------------------
 rsyslog.spec                        | 14 ++++++++------
 sources                             |  1 +
 4 files changed, 10 insertions(+), 33 deletions(-)
 delete mode 100644 rsyslog-8.24.0-recover_qi-doc.patch

diff --git a/.gitignore b/.gitignore
index 1c9fd38..a586369 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,4 @@ rsyslog-4.6.3.tar.gz
 /rsyslog-8.24.0.tar.gz
 /rsyslog-doc-8.24.0.tar.gz
 /rsyslog-8.25.0.tar.gz
+/rsyslog-doc-8.25.0.tar.gz
diff --git a/rsyslog-8.24.0-recover_qi-doc.patch b/rsyslog-8.24.0-recover_qi-doc.patch
deleted file mode 100644
index 42a69b1..0000000
--- a/rsyslog-8.24.0-recover_qi-doc.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From ff07a7cfc171dc2151cc8afe44776525d34a9e01 Mon Sep 17 00:00:00 2001
-From: jvymazal <jvymazal@redhat.com>
-Date: Tue, 3 Jan 2017 10:24:26 +0100
-Subject: [PATCH] Update queues.rst
-
-Update queues.rst
----
- source/concepts/queues.rst | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/source/concepts/queues.rst b/source/concepts/queues.rst
-index eb394e8..c71413c 100644
---- a/source/concepts/queues.rst
-+++ b/source/concepts/queues.rst
-@@ -153,6 +153,12 @@ can be requested via "*<object>QueueSyncQueueFiles on/off* with the
- default being off. Activating this option has a performance penalty, so
- it should not be turned on without reason.
- 
-+If you happen to lose or otherwise need the housekeeping structures and 
-+have all yours queue chunks you can use perl script included in rsyslog
-+package to generate it. 
-+Usage: recover_qi.pl -w *$WorkDirectory* -f QueueFileName -d 8 > QueueFileName.qi
-+
-+
- In-Memory Queues
- ~~~~~~~~~~~~~~~~
- 
diff --git a/rsyslog.spec b/rsyslog.spec
index 9b7f850..5f81181 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -16,12 +16,12 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 8.25.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
 Source0: http://www.rsyslog.com/files/download/rsyslog/%{name}-%{version}.tar.gz
-Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-8.24.0.tar.gz
+Source1: http://www.rsyslog.com/files/download/rsyslog/%{name}-doc-%{version}.tar.gz
 Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
@@ -55,8 +55,7 @@ Obsoletes: sysklogd < 1.5-11
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
 Patch0: rsyslog-8.8.0-sd-service.patch
 Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
-Patch2: rsyslog-8.24.0-recover_qi-doc.patch
-Patch3: rsyslog-8.24.0-missing-chdir-w-chroot.patch
+Patch2: rsyslog-8.24.0-missing-chdir-w-chroot.patch
 
 %package crypto
 Summary: Encryption support
@@ -272,14 +271,13 @@ The rsyslog-kafka package provides module for Apache Kafka output.
 %prep
 # set up rsyslog-doc sources
 %setup -q -a 1 -T -c
-%patch2 -p1
 rm -r LICENSE README.md build.sh source build/objects.inv
 mv build doc
 # set up rsyslog sources
 %setup -q -D
 %patch0 -p1
 %patch1 -p1
-%patch3 -p1
+%patch2 -p1
 
 autoreconf -iv
 
@@ -537,6 +535,10 @@ done
 %{_libdir}/rsyslog/omkafka.so
 
 %changelog
+* Wed Mar 01 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.25.0-2
+- rebased doc subpackage to 8.25.0 as well
+- dropped upstreamed doc patch
+
 * Tue Feb 28 2017 Jiri Vymazal <jvymazal@redhat.com> - 8.25.0-1
 - rebase to 8.25.0 upstream source version
 
diff --git a/sources b/sources
index 177dd67..f03e016 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 SHA512 (rsyslog-8.24.0.tar.gz) = b25b8ae72133376f732f54863c97aea3c8dfbf37c62c6a61840932996913c9d4e63155a24ffc577db48a18514f3e35b6fb109b1864380ba93ddf3fa6d84d728d
 SHA512 (rsyslog-doc-8.24.0.tar.gz) = b55cde1485a7baec6d4c4928107c22a078cf412a2994c0dfcbb12c47b49c3b263af8a64011b1329567cf86e04927b9e383581dc868eaea81d554adada6b3786b
 SHA512 (rsyslog-8.25.0.tar.gz) = 0e97db84cc8fe9fd6e3ffb5a78b32fd213e22833c6ed605329c579132d127b7d65b3f66c64e6bddeb1967aa9ed90645a7c24b9d5e643f95bdaf48ed9fc82cb5f
+SHA512 (rsyslog-doc-8.25.0.tar.gz) = e0068ec00bbda2d1cf7f14105ad83e82bea9291ed5d5fda3ffcff2db32747b65e7b6d65743a3221aeca03be9c6efcee1db7f03c2da115a3aed60848556befa71