[rsyslog] remove 'ExecStarPre' option from rsyslog.service

[Tomas Heinrich]

commit 11fce7a54b000309b6f77a6d59e74a647ffe6cbb
Author: Tomas Heinrich <theinric at redhat.com>
Date:   Wed Jun 20 18:58:48 2012 +0200

    remove 'ExecStarPre' option from rsyslog.service

 rsyslog-5.8.11-systemd.patch |   14 ++++++++++++++
 rsyslog-5.8.5-systemd.patch  |   14 --------------
 rsyslog.spec                 |    6 ++++--
 3 files changed, 18 insertions(+), 16 deletions(-)
---
diff --git a/rsyslog-5.8.11-systemd.patch b/rsyslog-5.8.11-systemd.patch
new file mode 100644
index 0000000..0fde0cd
--- /dev/null
+++ b/rsyslog-5.8.11-systemd.patch
@@ -0,0 +1,14 @@
+diff -up rsyslog-5.8.11/rsyslog.service.in.orig rsyslog-5.8.11/rsyslog.service.in
+--- rsyslog-5.8.11/rsyslog.service.in.orig	2012-06-20 18:28:14.561697697 +0200
++++ rsyslog-5.8.11/rsyslog.service.in	2012-06-20 18:28:45.554308105 +0200
+@@ -2,8 +2,8 @@
+ Description=System Logging Service
+ 
+ [Service]
+-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+-ExecStart=@sbindir@/rsyslogd -n -c5
++EnvironmentFile=-/etc/sysconfig/rsyslog
++ExecStart=@sbindir@/rsyslogd -n $SYSLOGD_OPTIONS
+ Sockets=syslog.socket
+ StandardOutput=null
+ 
diff --git a/rsyslog.spec b/rsyslog.spec
index 9a2e4fb..19b9f73 100644
--- a/rsyslog.spec
+++ b/rsyslog.spec
@@ -6,7 +6,7 @@
 Summary: Enhanced system logging and kernel message trapping daemon
 Name: rsyslog
 Version: 5.8.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: (GPLv3+ and ASL 2.0)
 Group: System Environment/Daemons
 URL: http://www.rsyslog.com/
@@ -16,7 +16,7 @@ Source2: rsyslog.conf
 Source3: rsyslog.sysconfig
 Source4: rsyslog.log
 # tweak the upstream service file to honour configuration from /etc/sysconfig/rsyslog
-Patch0: rsyslog-5.8.5-systemd.patch
+Patch0: rsyslog-5.8.11-systemd.patch
 Patch1: rsyslog-5.8.7-sysklogd-compat-1-template.patch
 Patch2: rsyslog-5.8.7-sysklogd-compat-2-option.patch
 Patch3: rsyslog-5.8.11-manpage-dbg-mode.patch
@@ -326,6 +326,8 @@ mv /var/lock/subsys/rsyslogd /var/lock/subsys/rsyslog
 %{_libdir}/rsyslog/omudpspoof.so
 
 %changelog
+* Wed Jun 20 2012 Tomas Heinrich <theinric at redhat.com> 5.8.11-2
+- update systemd patch: remove the 'ExecStartPre' option
 
 * Wed May 23 2012 Tomas Heinrich <theinric at redhat.com> 5.8.11-1
 - upgrade to new upstream stable version 5.8.11