[syslog-ng] Remove the ExecStartPre line from the service file (#833551)

[Jose Pedro Oliveira]

commit a09fc9ce11f7f2ef72c054f2a0553d65da9753c3
Author: Jose Pedro Oliveira <jpo at di.uminho.pt>
Date:   Tue Jun 19 23:39:35 2012 +0100

    Remove the ExecStartPre line from the service file (#833551)

 syslog-ng-3.2.5-syslog-ng.service.patch |   10 ++++++----
 syslog-ng.spec                          |    5 ++++-
 2 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/syslog-ng-3.2.5-syslog-ng.service.patch b/syslog-ng-3.2.5-syslog-ng.service.patch
index bdcbe50..e6be1f9 100644
--- a/syslog-ng-3.2.5-syslog-ng.service.patch
+++ b/syslog-ng-3.2.5-syslog-ng.service.patch
@@ -1,9 +1,11 @@
---- syslog-ng-3.2.5/contrib/systemd/syslog-ng.service	2011-10-23 07:48:18.000000000 +0100
-+++ syslog-ng-3.2.5-modified/contrib/systemd/syslog-ng.service	2011-12-15 02:25:38.598337205 +0000
-@@ -4,7 +4,7 @@
+diff -ruN syslog-ng-3.2.5-orig/contrib/systemd/syslog-ng.service syslog-ng-3.2.5/contrib/systemd/syslog-ng.service
+--- syslog-ng-3.2.5-orig/contrib/systemd/syslog-ng.service	2011-10-23 07:48:18.000000000 +0100
++++ syslog-ng-3.2.5/contrib/systemd/syslog-ng.service	2012-06-19 23:34:08.609378950 +0100
+@@ -3,8 +3,7 @@
+ 
  [Service]
  Sockets=syslog.socket
- ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
+-ExecStartPre=/bin/systemctl stop systemd-kmsg-syslogd.service
 -ExecStart=/usr/sbin/syslog-ng -F
 +ExecStart=/usr/sbin/syslog-ng -F -p /var/run/syslogd.pid
  ExecReload=/bin/kill -HUP $MAINPID
diff --git a/syslog-ng.spec b/syslog-ng.spec
index 7742d61..a7db69a 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -2,7 +2,7 @@
 
 Name: syslog-ng
 Version: 3.2.5
-Release: 14%{?dist}
+Release: 15%{?dist}
 Summary: Next-generation syslog server
 
 Group: System Environment/Daemons
@@ -263,6 +263,9 @@ fi
 
 
 %changelog
+* Tue Jun 19 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-15
+- Remove the ExecStartPre line from the service file (#833551)
+
 * Thu Apr 26 2012 Jose Pedro Oliveira <jpo at di.uminho.pt> - 3.2.5-14
 - Improve syslog-ng-3.2.5-tests-functional-sql-test.patch