From 2dae2489976d41bcd77d0d199673d5856d59aa35 Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@redhat.com>
Date: Mon, 2 Jul 2012 22:46:18 -0400
Subject: [PATCH] * Tue Jul 03 2012 Paul Wouters <pwouters@redhat.com> -
 1.3.1-9 - Rename non-existing openswan.service to ipsec.service (rhbz#836783)
 - Start after ipsec.service, but do not require it

---
 xl2tpd.service | 4 ++--
 xl2tpd.spec    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/xl2tpd.service b/xl2tpd.service
index 247a2ce..38b9abb 100644
--- a/xl2tpd.service
+++ b/xl2tpd.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Level 2 Tunnel Protocol Daemon (L2TP)
 After=syslog.target network.target
-After=openswan.service
+After=ipsec.service
 # Some ISPs in Russia use l2tp without IPsec, so don't insist anymore
-#Wants=openswan.service
+#Wants=ipsec.service
 
 [Service]
 Type=simple
diff --git a/xl2tpd.spec b/xl2tpd.spec
index e3e8ce3..d135674 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: 8%{?dist}
+Release: 9%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -120,6 +120,10 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
+* Tue Jul 03 2012 Paul Wouters <pwouters@redhat.com> - 1.3.1-9
+- Rename non-existing openswan.service to ipsec.service (rhbz#836783)
+- Start after ipsec.service, but do not require it
+
 * Tue Jun 26 2012 Paul Wouters <pwouters@redhat.com> - 1.3.1-8
 - The l2tp_ppp kernel module is now in kernel-module-extra
   (rhbz#832149)