[haproxy/f21] Use haproxy-systemd-wrapper in service file (#1126955)

[rohara]

commit 5f63fca61a3fcd00ac81aad25d6e1abe701f933d
Author: Ryan O'Hara <rohara at redhat.com>
Date:   Wed Aug 6 13:27:02 2014 -0500

    Use haproxy-systemd-wrapper in service file (#1126955)

 haproxy.service |    9 +++------
 haproxy.spec    |    5 ++++-
 2 files changed, 7 insertions(+), 7 deletions(-)
---
diff --git a/haproxy.service b/haproxy.service
index 4414d77..64f1cc6 100644
--- a/haproxy.service
+++ b/haproxy.service
@@ -1,13 +1,10 @@
 [Unit]
-Description=HAProxy For TCP And HTTP Based Applications
+Description=HAProxy Load Balancer
 After=syslog.target network.target
 
 [Service]
-Type=forking
-PIDFile=/run/haproxy.pid
-ExecStartPre=/usr/sbin/haproxy -c -q -f /etc/haproxy/haproxy.cfg
-ExecStart=/usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid
-ExecReload=/bin/bash -c "exec /usr/sbin/haproxy -D -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid -sf $MAINPID"
+ExecStart=/usr/sbin/haproxy-systemd-wrapper -f /etc/haproxy/haproxy.cfg -p /run/haproxy.pid
+ExecReload=/bin/kill -USR2 $MAINPID
 
 [Install]
 WantedBy=multi-user.target
diff --git a/haproxy.spec b/haproxy.spec
index c896125..a0032bc 100644
--- a/haproxy.spec
+++ b/haproxy.spec
@@ -8,7 +8,7 @@
 
 Name:           haproxy
 Version:        1.5.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        HAProxy reverse proxy for high availability environments
 
 Group:          System Environment/Daemons
@@ -135,6 +135,9 @@ exit 0
 %attr(-,%{haproxy_user},%{haproxy_group}) %dir %{haproxy_home}
 
 %changelog
+* Web Aug 06 2014 Ryan O'Hara <rohara at redhat.com> - 1.5.3-2
+- Use haproxy-systemd-wrapper in service file (#1126955)
+
 * Fri Jul 25 2014 Ryan O'Hara <rohara at redhat.com> - 1.5.3-1
 - Update to 1.5.3