Added forgoten patch

- rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
This commit is contained in:
Radovan Sroka 2016-12-20 18:21:57 +01:00
parent 3827bda634
commit 73ab8fcbf2

View File

@ -12,7 +12,7 @@
Summary: Enhanced system logging and kernel message trapping daemon Summary: Enhanced system logging and kernel message trapping daemon
Name: rsyslog Name: rsyslog
Version: 8.23.0 Version: 8.23.0
Release: 1%{?dist} Release: 2%{?dist}
License: (GPLv3+ and ASL 2.0) License: (GPLv3+ and ASL 2.0)
Group: System Environment/Daemons Group: System Environment/Daemons
URL: http://www.rsyslog.com/ URL: http://www.rsyslog.com/
@ -50,6 +50,7 @@ Obsoletes: sysklogd < 1.5-11
# tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
Patch0: rsyslog-8.8.0-sd-service.patch Patch0: rsyslog-8.8.0-sd-service.patch
Patch1: rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
%package crypto %package crypto
Summary: Encryption support Summary: Encryption support
@ -261,6 +262,7 @@ mv build doc
# set up rsyslog sources # set up rsyslog sources
%setup -q -D %setup -q -D
%patch0 -p1 %patch0 -p1
%patch1 -p1
autoreconf -iv autoreconf -iv
@ -516,6 +518,9 @@ done
%{_libdir}/rsyslog/omamqp1.so %{_libdir}/rsyslog/omamqp1.so
%changelog %changelog
* Tue Dec 20 2016 Radovan Sroka <rsroka@redhat.com> - 8.23.0-2
- added forgoten patch rsyslog-8.23.0-msg_c_nonoverwrite_merge.patch
* Tue Dec 20 2016 Radovan Sroka <rsroka@redhat.com> - 8.23.0-1 * Tue Dec 20 2016 Radovan Sroka <rsroka@redhat.com> - 8.23.0-1
- rebase to 8.23.0 - rebase to 8.23.0
- change build requires from libfastjson to libfastjson-devel - change build requires from libfastjson to libfastjson-devel