[xl2tpd/f17] * Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-8 - Remove non-existing openswan.servic

[Paul Wouters]

commit 8f209121a4043ce5d00e365978f85124e4ce7b38
Author: Paul Wouters <pwouters at redhat.com>
Date:   Mon Jul 2 22:23:35 2012 -0400

    * Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-8
    - Remove non-existing openswan.service dependancy
    - Start after ipsec.service, but do not require it (rhbz#836783)

 xl2tpd.service |    3 +--
 xl2tpd.spec    |    6 +++++-
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/xl2tpd.service b/xl2tpd.service
index d222874..0028030 100644
--- a/xl2tpd.service
+++ b/xl2tpd.service
@@ -1,8 +1,7 @@
 [Unit]
 Description=Level 2 Tunnel Protocol Daemon (L2TP)
 After=syslog.target network.target
-After=openswan.service
-Wants=openswan.service
+After=ipsec.service
 
 [Service]
 Type=simple
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 60672d9..c4b6b8f 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,7 +1,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
 Version: 1.3.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -118,6 +118,10 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Tue Jul 03 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-8
+- Remove non-existing openswan.service dependancy
+- Start after ipsec.service, but do not require it (rhbz#836783)
+
 * Fri Jun 15 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-7
 - Moved modprobe code from daemon to initscript/systemd
   (SElinux does not allow a daemon to do this, see rhbz#832149)