From 9af6d577d29de6976e5a39ffcfe5a302c071d8fe Mon Sep 17 00:00:00 2001
From: Paul Wouters <pwouters@fedoraproject.org>
Date: Sun, 10 Jan 2010 04:42:08 +0000
Subject: [PATCH] - Upgraded to 1.2.5. (fixes interop with two Windows machines
 behind same     NAT) - Fix mix space/tab in spec file - Added missing keyword
 Default-Stop

---
 .cvsignore  |  1 +
 sources     |  2 +-
 xl2tpd.init |  1 +
 xl2tpd.spec | 13 +++++++++----
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 46b9478..8b92b2b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -7,3 +7,4 @@ xl2tpd-1.1.11.tar.gz
 xl2tpd-1.1.12.tar.gz
 xl2tpd-1.2.0.tar.gz
 xl2tpd-1.2.4.tar.gz
+xl2tpd-1.2.5.tar.gz
diff --git a/sources b/sources
index 737cfe5..f5d735c 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d94fc8a13596f12a561240dfcea9f977  xl2tpd-1.2.4.tar.gz
 f796838eb19fb36d23ba8f25139302e3  xl2tpd.init
+40404ea230edd9ebdd0d53f07c832520  xl2tpd-1.2.5.tar.gz
diff --git a/xl2tpd.init b/xl2tpd.init
index 6b9e732..e0494e3 100644
--- a/xl2tpd.init
+++ b/xl2tpd.init
@@ -14,6 +14,7 @@
 # Required-Start: $local_fs $network $syslog
 # Required-Stop: $local_fs $network $syslog
 # Default-Start:
+# Default-Stop: 0 1 2 3 4 5 6
 # Short-Description: start|stop|status|restart|try-restart|reload|force-reload xl2tpd server
 # Description: control xl2tpd server
 ### END INIT INFO
diff --git a/xl2tpd.spec b/xl2tpd.spec
index 65fc8b9..ad5f02f 100644
--- a/xl2tpd.spec
+++ b/xl2tpd.spec
@@ -1,7 +1,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.2.4
-Release: 4%{?dist}
+Version: 1.2.5
+Release: 1%{?dist}
 # No version specified.
 License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
@@ -69,8 +69,8 @@ rm -rf %{buildroot}
 
 %preun
 if [ $1 -eq 0 ]; then
-	/sbin/service xl2tpd stop > /dev/null 2>&1
-	/sbin/chkconfig --del xl2tpd
+  /sbin/service xl2tpd stop > /dev/null 2>&1
+  /sbin/chkconfig --del xl2tpd
 fi
 
 %postun
@@ -92,6 +92,11 @@ fi
 %dir %{_localstatedir}/run/xl2tpd
 
 %changelog
+* Sat Jan 09 2010 Paul Wouters <paul@xelerance.com> - 1.2.5-1
+- Upgraded to 1.2.5. (fixes interop with two Windows machines behind same NAT)
+- Fix mix space/tab in spec file
+- Added missing keyword Default-Stop
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild