From 97dafa01c65f224bd3bfc5601ce4f9d4713de613 Mon Sep 17 00:00:00 2001 From: Paul Wouters Date: Thu, 7 Dec 2006 17:52:47 +0000 Subject: [PATCH] - Changed space/tab replacing method Wed Dec 6 2006 Paul Wouters 1.1.06-4 - Added -p to keep original timestamps - Added temporary hack to change space/tab in init file. - Added /sbin/service dependancy Tue Dec 5 2006 Paul Wouters 1.1.06-3 - Added Requires(post) / Requires(preun) - changed init file to create /var/run/xl2tpd fixed a tab/space - changed control file to be within /var/run/xl2tpd/ Tue Dec 5 2006 Paul Wouters 1.1.06-2 - Changed Mr. Karlsen's name to not be a utf8 problem - Fixed Obosoletes/Provides to be more specific wrt l2tpd. - Added dist tag which accidentally got deleted. --- xl2tpd.spec | 50 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 37 insertions(+), 13 deletions(-) diff --git a/xl2tpd.spec b/xl2tpd.spec index 58d7ef6..2012ca7 100644 --- a/xl2tpd.spec +++ b/xl2tpd.spec @@ -1,7 +1,7 @@ Summary: Layer 2 Tunnelling Protocol Daemon (RFC 2661) Name: xl2tpd Version: 1.1.06 -Release: 1 +Release: 5%{?dist} License: GPL Url: http://www.xelerance.com/software/xl2tpd/ Group: System Environment/Daemons @@ -9,7 +9,11 @@ Source0: http://www.xelerance.com/software/xl2tpd/xl2tpd-1.1.06.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: ppp #BuildRequires: -Obsoletes: l2tpd +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 %description xl2tpd is an implementation of the Layer 2 Tunnelling Protocol (RFC 2661). @@ -31,15 +35,17 @@ It runs completely in userspace. %build make DFLAGS="$RPM_OPT_FLAGS -g -DDEBUG_PPPD -DDEBUG_CONTROL -DDEBUG_ENTROPY" +sed -i -e 's|chkconfig:[ \t][ \t]*|chkconfig: |' packaging/fedora/xl2tpd.init %install rm -rf %{buildroot} make DESTDIR=%{buildroot} install -install -D -m644 examples/xl2tpd.conf %{buildroot}%{_sysconfdir}/xl2tpd/xl2tpd.conf -install -D -m644 examples/ppp-options.xl2tpd %{buildroot}%{_sysconfdir}/ppp/options.xl2tpd -install -D -m600 doc/l2tp-secrets.sample %{buildroot}%{_sysconfdir}/xl2tpd/l2tp-secrets -install -D -m600 examples/chapsecrets.sample %{buildroot}%{_sysconfdir}/ppp/chap-secrets.sample -install -D -m755 packaging/fedora/xl2tpd.init %{buildroot}%{_initrddir}/xl2tpd +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 + %clean rm -rf %{buildroot} @@ -55,15 +61,15 @@ then 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 -a /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets + cp -pa /etc/l2tpd/l2tp-secrets /etc/xl2tpd/l2tp-secrets fi %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 @@ -84,6 +90,24 @@ fi %changelog +* Thu Dec 7 2006 Paul Wouters 1.1.06-5 +- Changed space/tab replacing method + +* Wed Dec 6 2006 Paul Wouters 1.1.06-4 +- Added -p to keep original timestamps +- Added temporary hack to change space/tab in init file. +- Added /sbin/service dependancy + +* Tue Dec 5 2006 Paul Wouters 1.1.06-3 +- Added Requires(post) / Requires(preun) +- changed init file to create /var/run/xl2tpd fixed a tab/space +- changed control file to be within /var/run/xl2tpd/ + +* Tue Dec 5 2006 Paul Wouters 1.1.06-2 +- Changed Mr. Karlsen's name to not be a utf8 problem +- Fixed Obosoletes/Provides to be more specific wrt l2tpd. +- Added dist tag which accidentally got deleted. + * Mon Dec 4 2006 Paul Wouters 1.1.06-1 - Rebased spec file on Fedora Extras copy, but using xl2tpd as package name @@ -236,15 +260,15 @@ fi - Removed dependency on rpm-helper. * Mon Oct 21 2002 Lenny Cartier 0.69-3mdk -- from Per Øyvind Karlsen : +- from Per 0yvind Karlsen : - PreReq and Requires - Fix preun_service -* Thu Oct 17 2002 Per Øyvind Karlsen 0.69-2mdk +* Thu Oct 17 2002 Per 0yvind Karlsen 0.69-2mdk - Move l2tpd from /usr/bin to /usr/sbin - Added SysV initscript - Patch0 - Patch1 -* Thu Oct 17 2002 Per Øyvind Karlsen 0.69-1mdk +* Thu Oct 17 2002 Per 0yvind Karlsen 0.69-1mdk - Initial release