Rebase to 8.27.0

- dropped doc patch (upstreamed)
This commit is contained in:
Radovan Sroka 2017-05-23 10:17:34 +02:00
parent 2a544ec346
commit c27c7a3386
3 changed files with 9 additions and 5 deletions

2
.gitignore vendored
View File

@ -39,3 +39,5 @@ rsyslog-4.6.3.tar.gz
/rsyslog-doc-8.25.0.tar.gz
/rsyslog-8.26.0.tar.gz
/rsyslog-doc-8.26.0.tar.gz
/rsyslog-doc-8.27.0.tar.gz
/rsyslog-8.27.0.tar.gz

View File

@ -15,7 +15,7 @@
Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog
Version: 8.26.0
Version: 8.27.0
Release: 1%{?dist}
License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons
@ -56,7 +56,6 @@ 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.26.0-doc-update.patch
%package crypto
Summary: Encryption support
@ -277,7 +276,6 @@ mv build doc
%setup -q -D
%patch0 -p1
%patch1 -p1
%patch2 -p1
autoreconf -iv
@ -535,6 +533,10 @@ done
%{_libdir}/rsyslog/omkafka.so
%changelog
* Mon May 22 2017 Radovan Sroka <rsroka@redhat.com> - 8.27.0-1
- dropped patch2 (upstreamed)
- rebase to 8.27.0
* Tue Apr 18 2017 Radovan Sroka <rsroka@redhat.com> - 8.26.0-1
- rebase to 8.26.0
- added doc patch rhbz#1436113

View File

@ -1,2 +1,2 @@
SHA512 (rsyslog-8.26.0.tar.gz) = 96cb3af0e05b3e2941f7d2b3558e36836818037ef424f13a8ae2ac8a1e2aa0c7a4eedf3366c8360c7d8eb4515aecc7f3665690646009c650b66689067069af19
SHA512 (rsyslog-doc-8.26.0.tar.gz) = 5c05c13b3ae6be431343b7a5b3b2cb8676804d6d58d98826e6b44d685bb30fdaf3ced27d66a29908b40f1839bac45d1834d060ddf05d01477474ab3f45f973c8
SHA512 (rsyslog-doc-8.27.0.tar.gz) = 08d935ecad070d65e7169a56c6a4d35d49e895b4f7cfe4d747939d8a92bdadd0fc3be7cc47d23d233a33b964f2a4d809a34b37419d2e42c3f8c183120412ab2c
SHA512 (rsyslog-8.27.0.tar.gz) = dad957c21d9f7ed3a97a1ed87658fe9381dad00365bd2f5af2396dde3dc4a9f96db17c4df9eb9bd02562cc538f99bf8e2ca00229680d6b7892179161265db753