[httpd] systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg

[Jan Kaluža]

commit 51fe77bc1f4de5a7c1c3a8adb0061210c32ec9e4
Author: Jan Kaluza <jkaluza at redhat.com>
Date:   Fri Nov 1 12:43:40 2013 +0100

    systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg

 httpd.service |    2 +-
 httpd.spec    |    5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/httpd.service b/httpd.service
index 2dc16b9..04c43e2 100644
--- a/httpd.service
+++ b/httpd.service
@@ -24,7 +24,7 @@ Environment=LANG=C
 
 ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
 ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
-ExecStop=/bin/kill -WINCH $MAINPID
+ExecStop=/bin/kill -WINCH ${MAINPID}
 # We want systemd to give httpd some time to finish gracefully, but still want
 # it to kill httpd after TimeoutStopSec if something went wrong during the
 # graceful stop. Normally, Systemd sends SIGTERM signal right after the
diff --git a/httpd.spec b/httpd.spec
index 9efad60..0eb4967 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -14,7 +14,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.6
-Release: 6%{?dist}
+Release: 7%{?dist}
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: index.html
@@ -623,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_sysconfdir}/rpm/macros.httpd
 
 %changelog
+* Fir Nov  1 2013 Jan Kaluza <jkaluza at redhat.com> - 2.4.6-7
+- systemd: use {MAINPID} notation to ensure /bin/kill has always the second arg
+
 * Thu Oct 31 2013 Joe Orton <jorton at redhat.com> - 2.4.6-6
 - mod_ssl: allow SSLEngine to override Listen-based default (r1537535)