use License header, fix BuildRoot

diff --git a/Changes b/Changes
index 60abca9..403d48b 100644 (file)
--- a/Changes
+++ b/Changes
@@ -1,5 +1,7 @@
 * Fri Nov 25 2005 Brendan O'Dea <bod@optus.net> 2.1.13
 - Add test/ping-sweep.
 * Fri Nov 25 2005 Brendan O'Dea <bod@optus.net> 2.1.13
 - Add test/ping-sweep.

+- Apply spec changes from Charlie Brady: use License header, change
+  BuildRoot to include username.

 
 * Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12
 - Set MTU on tunnel interface so the kernel will re-fragment large
 
 * Thu Nov 17 2005 Brendan O'Dea <bod@optus.net> 2.1.12
 - Set MTU on tunnel interface so the kernel will re-fragment large

diff --git a/THANKS b/THANKS
index ffe0aa7..5b84a4a 100644 (file)
--- a/THANKS
+++ b/THANKS
@@ -21,3 +21,4 @@ Dominique Rousseau         <d.rousseau@nnx.com>
 Tim Devries                <tdevries@northrock.bm>
 Slobodan Tomic             <stomic@loznica.com>
 Michael Chapman            <mike.chapman@optus.net>
 Tim Devries                <tdevries@northrock.bm>
 Slobodan Tomic             <stomic@loznica.com>
 Michael Chapman            <mike.chapman@optus.net>

+Charlie Brady              <charlieb@e-smith.com>

diff --git a/l2tpns.spec b/l2tpns.spec
index 513541e..8192a35 100644 (file)
--- a/l2tpns.spec
+++ b/l2tpns.spec
@@ -2,11 +2,11 @@ Summary: A high-speed clustered L2TP LNS
 Name: l2tpns
 Version: 2.1.13
 Release: 1
 Name: l2tpns
 Version: 2.1.13
 Release: 1

-Copyright: GPL
+License: GPL

 Group: System Environment/Daemons
 Source: http://optusnet.dl.sourceforge.net/sourceforge/l2tpns/l2tpns-%{version}.tar.gz
 URL: http://sourceforge.net/projects/l2tpns
 Group: System Environment/Daemons
 Source: http://optusnet.dl.sourceforge.net/sourceforge/l2tpns/l2tpns-%{version}.tar.gz
 URL: http://sourceforge.net/projects/l2tpns

-BuildRoot: %{_tmppath}/%{name}-%{version}-root
+BuildRoot: %{_tmppath}/%{name}-%{version}-%(%__id -un)

 Prereq: /sbin/chkconfig
 BuildRequires: libcli >= 1.8.5
 Requires: libcli >= 1.8.5
 Prereq: /sbin/chkconfig
 BuildRequires: libcli >= 1.8.5
 Requires: libcli >= 1.8.5