[xl2tpd] * don't use old version of if_pppol2tp.h

[Paul Wouters]

commit d63dbfa210f3556a14c31a9b14a6a6714bb589fe
Author: Paul Wouters <paul at libreswan.org>
Date:   Tue Jun 12 12:58:32 2012 -0400

    * don't use old version of if_pppol2tp.h

 xl2tpd.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 9bc5e55..d0b360f 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: 6%{?dist}
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -52,6 +52,7 @@ It was de-facto maintained by Jacco de Leeuw <jacco2 at dds.nl> in 2002 and 2003.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+rm linux/include/linux/if_pppol2tp.h 
 
 %build
 #make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_FLOW -DDEBUG_PAYLOAD -DDEBUG_CONTROL -DDEBUG_CONTROL_XMIT -DDEBUG_FLOW_MORE -DDEBUG_MAGIC -DDEBUG_ENTROPY -DDEBUG_HIDDEN -DDEBUG_PPPD -DDEBUG_AAA -DDEBUG_FILE -DDEBUG_FLOW -DDEBUG_HELLO -DDEBUG_CLOSE -DDEBUG_ZLB -DDEBUG_AUTH"
@@ -117,12 +118,11 @@ fi
 %ghost %attr(0600,root,root) %{_localstatedir}/run/xl2tpd/l2tp-control
 
 %changelog
-* Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-7
-- Improved patch, more doc fixed (esp. "force userspace" option)
-
 * Tue Jun 12 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-6
 - Added patch for xl2tpd.conf to improve interop settings
   (no longer need to say "no encryption" on Windows)
+- Improved patch, more doc fixed (esp. "force userspace" option)
+- don't use old version of if_pppol2tp.h
 
 * Wed Apr 18 2012 Paul Wouters <pwouters at redhat.com> - 1.3.1-5
 - Added support for CONFIG_PPPOL2TP by sigwall <fionov at gmail.com>