rpms/xl2tpd/EL-5 sources,1.5,1.6 xl2tpd.spec,1.7,1.8

[Paul Wouters]

Author: pwouters

Update of /cvs/extras/rpms/xl2tpd/EL-5
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2282

Modified Files:
	sources xl2tpd.spec 
Log Message:
* Wed May 06 2009 Paul Wouters <paul at xelerance.com> - 1.2.4-1
- Upgraded to 1.2.4
- Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100
- Merged spec file with upstream
- Fix license tag



Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xl2tpd/EL-5/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- sources	28 Jul 2007 17:26:06 -0000	1.5
+++ sources	6 May 2009 19:19:00 -0000	1.6
@@ -1,4 +1 @@
-44e5a85ecce622a0f55aafc42ce589a8  xl2tpd-1.1.06.tar.gz
-d0c310b7a135b385ab5a61325e56566a  xl2tpd-1.1.08.tar.gz
-7782de2b3a37631bcf83305127aca9ac  xl2tpd-1.1.09.tar.gz
-ab5656eb5a3d1973f7f69b039675332e  xl2tpd-1.1.11.tar.gz
+d94fc8a13596f12a561240dfcea9f977  xl2tpd-1.2.4.tar.gz


Index: xl2tpd.spec
===================================================================
RCS file: /cvs/extras/rpms/xl2tpd/EL-5/xl2tpd.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- xl2tpd.spec	28 Jul 2007 17:30:39 -0000	1.7
+++ xl2tpd.spec	6 May 2009 19:19:01 -0000	1.8
@@ -1,14 +1,14 @@
 Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661)
 Name: xl2tpd
-Version: 1.1.11
-Release: 2%{?dist}
-License: GPL
+Version: 1.2.4
+Release: 1%{?dist}
+License: GPL+
 Url: http://www.xelerance.com/software/xl2tpd/
 Group: System Environment/Daemons
 Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: ppp 
-#BuildRequires:
+BuildRequires: libpcap-devel
 Obsoletes: l2tpd <= 0.69-0.6.20051030.fc6
 Provides: l2tpd = 0.69-0.6.20051030.fc7
 Requires(post): /sbin/chkconfig
@@ -39,12 +39,13 @@ sed -i -e 's|chkconfig:[ \t][ \t]*|chkco
 
 %install
 rm -rf %{buildroot}
-make DESTDIR=%{buildroot} install
+make DESTDIR=%{buildroot} PREFIX=%{_prefix} install
 install -p -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf
 install -p -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd
 install -p -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets
 install -p -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample
 install -p -D -m755 packaging/fedora/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd
+install -p -D -m755 -d %{buildroot}%{_localstatedir}/run/xl2tpd
 
 
 %clean
@@ -82,14 +83,22 @@ fi
 %doc BUGS CHANGES CREDITS LICENSE README.* TODO doc/rfc2661.txt 
 %doc doc/README.patents examples/chapsecrets.sample
 %{_sbindir}/xl2tpd
+%{_bindir}/pfc
 %{_mandir}/*/*
 %dir %{_sysconfdir}/xl2tpd
 %config(noreplace) %{_sysconfdir}/xl2tpd/*
 %config(noreplace) %{_sysconfdir}/ppp/*
 %attr(0755,root,root)  %{_initrddir}/xl2tpd
-
+%dir %{_localstatedir}/run/xl2tpd
 
 %changelog
+* Wed May 06 2009 Paul Wouters <paul at xelerance.com> - 1.2.4-1
+- Upgraded to 1.2.4
+- Fix initscript for https://bugzilla.redhat.com/show_bug.cgi?id=247100
+- Merged spec file with upstream
+- Fix license tag
+
+
 * Sat Jul 28 2007 Paul Wouters <paul at xelerance.com> 1.1.11-2
 - Upgraded to 1.1.11
 - Include new split README.*