Fri Oct 26 2007 Paul Wouters <paul@xelerance.com> 1.1.12-1

- Upgraded to new release upstream
- Removed l2tpd to xl2tpd migration in post

.cvsignore

@@ -4,3 +4,4 @@ xl2tpd.init
 xl2tpd-1.1.08.tar.gz
 xl2tpd-1.1.09.tar.gz
 xl2tpd-1.1.11.tar.gz
+xl2tpd-1.1.12.tar.gz

sources

@@ -1,5 +1,3 @@
-56688bc2eaae6a55d92bdc9fa4680632  xl2tpd-1.1.07.tar.gz
 5aebd437a6a9049a63c44825a6d1829c  xl2tpd.init
-d0c310b7a135b385ab5a61325e56566a  xl2tpd-1.1.08.tar.gz
-7782de2b3a37631bcf83305127aca9ac  xl2tpd-1.1.09.tar.gz
 ab5656eb5a3d1973f7f69b039675332e  xl2tpd-1.1.11.tar.gz
+8ace771a29139485c0edf428091cad5d  xl2tpd-1.1.12.tar.gz

xl2tpd.spec

@@ -1,7 +1,7 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.1.11
-Release: 3%{?dist}
+Version: 1.1.12
+Release: 1%{?dist}
 License: GPL
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
@@ -9,8 +9,6 @@ Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp 
 #BuildRequires:
-Obsoletes: l2tpd <= 0.69-0.6.20051030.fc6
-Provides: l2tpd = 0.69-0.6.20051030.fc7
 Requires(post): /sbin/chkconfig
 Requires(preun): /sbin/chkconfig
 Requires(preun): /sbin/service
@@ -53,19 +51,6 @@ rm -rf %{buildroot}
 
 %post
 /sbin/chkconfig --add xl2tpd
-# if we migrate from l2tpd to xl2tpd, copy the configs
-if [ -f /etc/l2tpd/l2tpd.conf ]
-then
-	echo "Old /etc/l2tpd configuration found, migrating to /etc/xl2tpd"
-	mv /etc/xl2tpd/xl2tpd.conf /etc/xl2tpd/xl2tpd.conf.rpmsave
-	cat /etc/l2tpd/l2tpd.conf | sed "s/options.l2tpd/options.xl2tpd/" > /etc/xl2tpd/xl2tpd.conf
-	mv /etc/ppp/options.xl2tpd /etc/ppp/options.xl2tpd.rpmsave
-	mv /etc/ppp/options.l2tpd /etc/ppp/options.xl2tpd
-	mv /etc/xl2tpd/l2tp-secrets /etc/xl2tpd/l2tpd-secrets.rpmsave
-	cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets
-	
-fi
-
 
 %preun
 if [ $1 -eq 0 ]; then
@@ -91,6 +76,10 @@ fi
 %dir %{_localstatedir}/run/xl2tpd
 
 %changelog
+* Fri Oct 26 2007 Paul Wouters <paul@xelerance.com> 1.1.12-1
+- Upgraded to new release upstream
+- Removed l2tpd to xl2tpd migration in post
+
 * Wed Aug 29 2007 Fedora Release Engineering <rel-eng at fedoraproject dot org> - 1.1.11-3
 - Rebuild for selinux ppc32 issue.