--- a/ChangeLog	Wed Sep 10 17:21:36 2008 +0000
+++ b/ChangeLog	Wed Sep 10 17:39:12 2008 +0000
@@ -1,3 +1,8 @@
+2008-09-10  Ghee Teo <[email protected]>
+
+	* SUNWgnome-nettool.spec: add %doc to %files
+	* copyright/SUNWgnome-nettool.copyright: updated with new format.
+
 2008-09-10  Matt Keenan  <[email protected]>
 
 	* SUNWgnome-camera.spec: Add %doc to %files

--- a/SUNWgnome-nettool.spec	Wed Sep 10 17:21:36 2008 +0000
+++ b/SUNWgnome-nettool.spec	Wed Sep 10 17:39:12 2008 +0000
@@ -86,6 +86,9 @@
 
 
 %files
+%doc -d gnome-nettool-%{nettool.version} README AUTHORS
+%doc(bzip2) -d gnome-nettool-%{nettool.version} COPYING NEWS ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
@@ -140,6 +143,8 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 - [email protected]
+- add %doc for copyright files.
 * Wed Sep 10 2008 - [email protected]
 - Updated for l10n omf files.
 * Mon Aug 25 2008 - [email protected]

--- a/copyright/SUNWgnome-nettool.copyright	Wed Sep 10 17:21:36 2008 +0000
+++ b/copyright/SUNWgnome-nettool.copyright	Wed Sep 10 17:39:12 2008 +0000
@@ -1,81 +1,31 @@
-  Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-  Use is subject to license terms.
-
----------------------------------------------------------------
-
-  For the avoidance of doubt, except that if any license choice other
-  than GPL or LGPL is available it will apply instead, Sun elects to
-  use only the General Public License version 2 (GPLv2) at this time
-  for any software where a choice of GPL license versions is made
-  available with the language indicating that GPLv2 or any later
-  version may be used, or where a choice of which version of the GPL
-  is applied is otherwise unspecified.
-
---------------------------------------------------------------------
+Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+Use is subject to license terms.
 
-  Copyright (C) 1995-1997, 2002  Peter Mattis, Red Hat, Inc.
-  Copyright 1997-2000 by Donald Becker <[email protected]>
-  Copyright (C) 2000 David A. Hinds -- [email protected]
-  Copyright (C) 2003 German Poo-Caaman~o <[email protected]>
-  Copyright (C) 2002, 2003 by German Poo-Caaman~o
-  Copyright (C) 2003 by William Jon McCann
-  Copyright (C) 2004 by Carlos Garc\357\277\275a Campos
-  Copyright (C) 2008 James Carlson, [email protected]
-
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- 
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+For the avoidance of doubt, except that if any license choice other
+than GPL or LGPL is available it will apply instead, Sun elects to
+use only the General Public License version 2 (GPLv2) at this time
+for any software where a choice of GPL license versions is made
+available with the language indicating that GPLv2 or any later
+version may be used, or where a choice of which version of the GPL
+is applied is otherwise unspecified.
 
 --------------------------------------------------------------------
 
-  Copyright 1997-2000 by Donald Becker <[email protected]>
-  Copyright (C) 2000 David A. Hinds -- [email protected]
+Licensing and copyright information for %{name}:
 
-  This program is based on David A. Hinds "mii-tool".
-  "mii-tool" is based on Donald Becker's "mii-diag" program.
- 
- 
-  mii-tool is written/copyright 2000 by David A. Hinds
-     -- [email protected]
- 
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- 
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
+License:
+   binaries: GNU General Public License Version 2
  
-  You should have received a copy of the GNU General Public License
-  along with this program; if not, write to the Free Software
-  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  and/or modify it under the terms of the GNU General Public
-  License as published by the Free Software Foundation.
- 
-  Donald Becker may be reached as [email protected], or C/O
-  Scyld Computing Corporation, 410 Severn Av., Suite 210,
-  Annapolis, MD 21403
- 
-  References
-  http://www.scyld.com/diag/mii-status.html
-  http://www.scyld.com/expert/NWay.html
-  http://www.national.com/pf/DP/DP83840.html
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
---------------------------------------------------------------------
+  COPYING.bz2: GNU GPL
+  AUTHORS: list of authors of %{name}
+  NEWS.bz2: list of the most important changes in %{name}
+  ChangeLog.bz2: list of all changes and authors of %{name}
+  README: more information about %{name}            
 
-  Copyright (c) 1997-2002 Jean Tourrilhes, All Rights Reserved.
+ The sources of gnome-nettool-%{nettool.version} were downloaded
+ from %{nettool.SOURCE0.url}
 
---------------------------------------------------------------------