--- a/ChangeLog	Fri Sep 19 03:47:59 2008 +0000
+++ b/ChangeLog	Fri Sep 19 03:59:26 2008 +0000
@@ -1,3 +1,15 @@
+2008-09-19  Halton Huo  <[email protected]>
+
+	Update for new copyright
+	* SUNWbrltty.spec:
+	* SUNWgnome-gui-test.spec:
+	* SUNWgnome-user-docs.spec:
+	* SUNWsolaris-devel-docs.spec:
+	* copyright/SUNWbrltty.copyright:
+	* copyright/SUNWgnome-gui-test.copyright:
+	* copyright/SUNWgnome-user-docs.copyright:
+	* copyright/SUNWsolaris-devel-docs.copyright:
+
 2008-09-19  Dave Lin  <[email protected]>
 
 	* SUNWfirefox.spec: Change class action scripts to remove the
@@ -244,18 +256,18 @@
 
 2008-09-17  Henry Zhang  <[email protected]>
 
-        * copyright/SUNWvirt-manager.copyright: use new format
-        * SUNWvirt-manager.spec: add Copyright %docs
+	* copyright/SUNWvirt-manager.copyright: use new format
+	* SUNWvirt-manager.spec: add Copyright %docs
 
 2008-09-17  Henry Zhang  <[email protected]>
 
-        * copyright/SUNWlibgtop.copyright: use new format
-        * SUNWlibgtop.spec: add Copyright %docs
+	* copyright/SUNWlibgtop.copyright: use new format
+	* SUNWlibgtop.spec: add Copyright %docs
 
 2008-09-17  Henry Zhang  <[email protected]>
 
-        * copyright/SUNWgnome-system-monitor.copyright: use new format
-        * SUNWgnome-system-monitor.spec: add Copyright %docs
+	* copyright/SUNWgnome-system-monitor.copyright: use new format
+	* SUNWgnome-system-monitor.spec: add Copyright %docs
 
 2008-09-17  Halton Huo  <[email protected]>
 
@@ -424,7 +436,7 @@
 	* SUNWlibgcrypt.spec:
 	* SUNWseahorse.spec:
 	* copyright/SUNWseahorse.copyright:
-    Update copyright info.
+	Update copyright info.
 
 2008-09-16  Halton Huo  <[email protected]>
 

--- a/SUNWbrltty.spec	Fri Sep 19 03:47:59 2008 +0000
+++ b/SUNWbrltty.spec	Fri Sep 19 03:59:26 2008 +0000
@@ -96,6 +96,13 @@
 
 %files
 %defattr (-, root, bin)
+%doc(bzip2) -d %{base_arch}/brltty-%{brltty.version} README
+%doc(bzip2) -d %{base_arch}/brltty-%{brltty.version} COPYING
+%doc(bzip2) -d %{base_arch}/brltty-%{brltty.version} COPYING-API
+%doc -d %{base_arch}/brltty-%{brltty.version}/Documents CONTRIBUTORS
+%doc -d %{base_arch}/brltty-%{brltty.version}/Documents HISTORY
+%doc(bzip2) -d %{base_arch}/brltty-%{brltty.version}/Documents ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/brltty*
 %{_bindir}/vstp
@@ -138,6 +145,8 @@
 
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc part to %files
 * Mon Jul 07 2008 - [email protected]
 - Fix 6697334. Add 64 bit libraries support.
 * Thu Apr 03 2008 - [email protected]

--- a/SUNWgnome-gui-test.spec	Fri Sep 19 03:47:59 2008 +0000
+++ b/SUNWgnome-gui-test.spec	Fri Sep 19 03:59:26 2008 +0000
@@ -59,6 +59,8 @@
 
 %files
 %defattr (-, root, bin)
+%doc -d dogtail-%{dogtail.version} README
+%doc(bzip2) -d dogtail-%{dogtail.version} COPYING NEWS
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/*
 %dir %attr (0755, root, bin) %{_libdir}
@@ -67,11 +69,13 @@
 %dir %attr (0755, root, other) %{_datadir}/applications
 %{_datadir}/applications/*.desktop
 %dir %attr (0755, root, other) %{_datadir}/doc
-%{_datadir}/doc/*
+%{_datadir}/doc/dogtail
 %{_datadir}/dogtail
 %attr (-, root, other) %{_datadir}/icons
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc part to %files
 * Thu Apr 03 2008 - [email protected]
 - Add SUNW_Copyright.
 * Wed Apr 04 2007 - [email protected]

--- a/SUNWgnome-user-docs.spec	Fri Sep 19 03:47:59 2008 +0000
+++ b/SUNWgnome-user-docs.spec	Fri Sep 19 03:59:26 2008 +0000
@@ -77,6 +77,10 @@
 
 %files
 %defattr (-, root, bin)
+%doc -d gnome-user-docs-%{gud.version} README AUTHORS
+%doc(bzip2) -d gnome-user-docs-%{gud.version} COPYING COPYING-DOCS
+%doc(bzip2) -d gnome-user-docs-%{gud.version} NEWS ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/*/C
@@ -94,6 +98,8 @@
 
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc part to %files
 * Thu Apr 03 2008 - [email protected]
 - Add SUNW_Copyright.
 * Tue Jul 10 2007 - [email protected]

--- a/SUNWsolaris-devel-docs.spec	Fri Sep 19 03:47:59 2008 +0000
+++ b/SUNWsolaris-devel-docs.spec	Fri Sep 19 03:59:26 2008 +0000
@@ -75,8 +75,10 @@
 
 %files
 %defattr (-, root, bin)
+%doc README
+%doc(bzip2) COPYING ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/soldevex/html/developer_guide.html
 %{_datadir}/doc/soldevex/html/images
 %{_datadir}/doc/soldevex/html/content
@@ -142,6 +144,8 @@
 %endif
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc part to %files
 * Thu Apr 03 2008 - [email protected]
 - Add SUNW_Copyright.
 * Thu Jan 03 2008 - [email protected]

--- a/copyright/SUNWbrltty.copyright	Fri Sep 19 03:47:59 2008 +0000
+++ b/copyright/SUNWbrltty.copyright	Fri Sep 19 03:59:26 2008 +0000
@@ -1,3 +1,6 @@
+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
@@ -7,178 +10,21 @@
 is applied is otherwise unspecified.
 
 --------------------------------------------------------------------
-Copyright (C) 1995-2007 by The BRLTTY Team - All Rights Reserved.
 
-Web Page: http://mielke.cc/brltty/
-
-BRLTTY is free software. It comes with ABSOLUTELY NO WARRANTY.
-
-BRLTTY is placed under the terms of the GNU General Public License [GPL] as
-published by the Free Software Foundation; see the file COPYING for details.
-Version 2 (or any later version) of the GPL may be used when redistributing
-and/or modifying this software. This statement applies to all the files
-contained within this directory structure except for those explicitly listed in
-the next paragraph as a special exception has been made regarding those files
-which are part of the client side of BRLTTY's API.
-
-A special exception has been made for those files which are part of the client
-side of BRLTTY's API, BrlAPI. They are placed under the terms of the GNU Lesser
-General Public License [LGPL] as published by the Free Software Foundation; see
-the file COPYING-API for details. Version 2.1 (or any later version) of the
-LGPL may be used when redistributing and/or modifying these files. The files
-covered by this special exception are:
-
-   Programs/brlapi.h.in
-   Programs/brlapi_keycodes.h
-   Programs/brlapi_protocol.h
-   Programs/brlapi_client.c
-   Programs/brlapi_common.h
-   BrailleDrivers/VisioBraille/brldefs-vs.h
-
-This software is maintained by: Dave Mielke <[email protected]>
-
-The members of The BRLTTY Team are:
-
-   Dave Mielke <[email protected]>
-   Nicolas Pitre <[email protected]>
-   Stephane Doyon <[email protected]>
+Licensing and copyright information for %{name}:
 
---------------------------------------------------------------------
- Copyright 2003, Mario Lang
- Copyright 2003, BAUM Retec A.G.
- Copyright 2003, Sun Microsystems Inc. 
- Copyright (C) 2006-2007 S&S
- Samuel Thibault <[email protected]>
- S�bastien Hinderer <[email protected]>
- Nikhil Nair <[email protected]>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
-
- This library 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
- Library General Public License for more details.
-
- You should have received a copy of the GNU Library General Public
- License along with this library; if not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
+ License: GNU General Public License Version 2
+ License: GNU Lesser General Public License Version 2.1
  
-
---------------------------------------------------------------------
-
-
- 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 the program ; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- 
-
---------------------------------------------------------------------
-
- libbrlapi - A library providing access to braille terminals for applications.
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
- Copyright (C) 2006-2007 by
-   Samuel Thibault <[email protected]>
-   S�bastien Hinderer <[email protected]>
-   Alexis Robert <[email protected]>
- Copyright (C) 2006-2007 by Dave Mielke <[email protected]>
-
- libbrlapi comes with ABSOLUTELY NO WARRANTY.
-
- This is free software, placed under the terms of the
- GNU Lesser General Public License, as published by the Free Software
- Foundation; either version 2.1 of the License,
- or (at your option) any later version.
- Please see the file COPYING-API for details.
-
- Web Page: http://mielke.cc/brltty/
-
- This software is maintained by Dave Mielke <[email protected]>.
- 
-
---------------------------------------------------------------------
-
- XBrlAPI - A background process tinkering with X for proper BrlAPI behavior
-
- Copyright (C) 2003-2007 by Samuel Thibault <[email protected]>
-
- XBrlAPI comes with ABSOLUTELY NO WARRANTY.
-
- BRLTTY - A background process providing access to the console screen (when in
-          text mode) for a blind person using a refreshable braille display.
-
- Copyright (C) 1995-2007 by The BRLTTY Developers.
-
- BRLTTY comes with ABSOLUTELY NO WARRANTY.
-
- This is free software, placed under the terms of the
- GNU General Public License, as published by the Free Software
- Foundation.  Please see the file COPYING for details.
-
- Web Page: http://mielke.cc/brltty/
-
- This software is maintained by Dave Mielke <[email protected]>.
+  COPYING.bz2: GNU GPL
+  COPYING-API.bz2: GNU LGPL
+  CONTRIBUTORS: list of authors of brltty
+  HISTORY: history of brltty
+  ChangeLog.bz2: list of all changes and authors of brltty
+  README.bz2: more information about brltty       
 
- 
- MDV/braille.c - Braille display driver for MDV displays.
- Written by St�phane Doyon ([email protected]) in collaboration with
- Simone Dal Maso <[email protected]>.
-
- MiniBraille/braille.c - Braille display library
- Brailcom o.p.s. <[email protected]>
- Thanks to Tieman B.V.
- 
- This Driver was written as a project in the
-   HTL W1, Abteilung Elektrotechnik, Wien - �sterreich
-   (Technical High School, Department for electrical engineering,
-     Vienna, Austria)
-  by
-   Tibor Becker
-   Michael Burger
-   Herbert Gruber
-   Heimo Sch�n
- Teacher:
-   August H�randl <[email protected]>
-
- EuroBraille/braille.c - Braille display library for the IRIS family.
- Copyright (C) 2004 by Yannick Plassiard <[email protected]>
-
- Libbraille/braille.c - Braille display driver using libbraille
- Written by Sebastien Sable <[email protected]>
-
- FestivalLite/speech.c - Speech library
- For the Festival Lite text to speech package
- Maintained by Mario Lang <[email protected]>
- 
- EcoBraille/braille.c - Braille display library for ECO Braille series
- Copyright (C) 1999 by Oscar Fernandez <[email protected]>
- 
- Miscellaneous FM chip soundcard routines for BRLTTY.
- Implemented by Dave Mielke <[email protected]>.
- Method gleaned from sccw, a morse code program written
- by Steven J. Merrifield <[email protected]> (VK3ESM).
- 
- Support for all Papenmeier Terminal + config file
-   Heimo.Sch�n <[email protected]>
-   August H�randl <[email protected]>
- 
- Support for all Papenmeier Terminal + config file
-   Heimo.Sch�n <[email protected]>
-   August H�randl <[email protected]>
- 
- EcoBraille/braille.h - Configurable definitions for the Eco Braille series
- Copyright (C) 1999 by Oscar Fernandez <[email protected]>
-
+ The sources of brltty-%{brltty.version} were downloaded
+ from %{brltty.SOURCE0.url}

--- a/copyright/SUNWgnome-gui-test.copyright	Fri Sep 19 03:47:59 2008 +0000
+++ b/copyright/SUNWgnome-gui-test.copyright	Fri Sep 19 03:59:26 2008 +0000
@@ -1,3 +1,6 @@
+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
@@ -8,19 +11,16 @@
 
 --------------------------------------------------------------------
 
- 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.
+Licensing and copyright information for %{name}:
+
+ License: GNU General Public License Version 2
+ 
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
- 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.
+  COPYING.bz2: GNU GPL
+  NEWS.bz2: list of the most important changes in dogtail
+  README: more information about dogtail
 
- 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA
-
---------------------------------------------------------------------
-
+ The sources of dogtail-%{dogtail.version} were downloaded
+ from %{dogtail.SOURCE0.url}

--- a/copyright/SUNWgnome-user-docs.copyright	Fri Sep 19 03:47:59 2008 +0000
+++ b/copyright/SUNWgnome-user-docs.copyright	Fri Sep 19 03:59:26 2008 +0000
@@ -1,56 +1,21 @@
+Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+Use is subject to license terms.
 
-  Permission is granted to copy, distribute and/or modify this document
-  under the terms of the GNU Free Documentation License, Version 1.2
-  or any later version published by the Free Software Foundation;
-  with no Invariant Sections, no Front-Cover Texts, and no Back-Cover
-  Texts.  A copy of the license is available at
-  http://www.gnu.org/licenses/fdl.txt
+--------------------------------------------------------------------
 
-Authors: Chris Lyttle <[email protected]>
-         [email protected] <Sun Microsystems>
-         Alexander Kirillov <[email protected]>
+Licensing and copyright information for %{name}:
 
-Contributions:
-A P S Alam <[email protected]>
-Brent Smith <[email protected]>  
-Changwoo Ryu <[email protected]>  
-Chris Fox (Karderio) <chrisfox -at-
-Christian Neumair <[email protected]>  
-Christophe Bliard <[email protected]>  
-Claude Paroz <[email protected]>  
-Dan Mueth <[email protected]>  
-Daniel Nylander <[email protected]>  
-David Lodge <[email protected]>  
-Djihed Afifi <[email protected]>  
-Don Scorgie <[email protected]>  
-Duarte Loreto <[email protected]>  
-Eugene O'Connor <[email protected]>  
-Francisco Javier F. Serrador <[email protected]>
-Gabor Kelemen <[email protected]>  
-Gil Forcada <[email protected]>  
-Gregory Leblanc <[email protected]>  
-Ilkka Tuohela <[email protected]>  
-Irene Ryan <[email protected]>  
-Jacob Berkman <[email protected]>
-Jan Arne Petersen <[email protected]> 
-Joachim Noreiko <[email protected]>  
-John Fleck <[email protected]>  
-Jorge Gonzalez <[email protected]>  
-Kjartan Maraas <[email protected]>  
-Leandro su Nerone <[email protected]> 
-Leonardo Ferreira Fontenelle <[email protected]> 
-Luca Ferretti <[email protected]>  
-Manuel de Vega Barreiro <[email protected]>
-Mariano Surez-Alvarez <[email protected]>  
-Marius Andreiana <marius galuna.ro> 
-Maxim Dziumanenko <[email protected]>  
-Mike Lei <[email protected]>  
-Nickolay V. Shmyrev <[email protected]> 
-Nikos Charonitakis <[email protected]>  
-Pablo Saratxaga <[email protected]>  
-Raphael Higino <[email protected]>  
-Robin Slomkowski <[email protected]> 
-Shaun McCance <[email protected]>  
-Simos Xenitellis <[email protected]>  
-Timo Jyrinki <[email protected]>  
-William Jon McCann <[email protected]> 
+ License: GNU Free Documentation License Version 1.1
+ 
+ You can find more information in the following directory:
+ %{_pkg_docdir}
+
+  COPYING.bz2: GNU Free Documentation License
+  COPYING-DOCS.bz2: GNU Free Documentation License
+  NEWS.bz2: list of the most important changes in gnome-user-docs
+  ChangeLog.bz2: list of all changes and authors of gnome-user-docs
+  AUTHORS: list of authors of gnome-user-docs
+  README: more information about gnome-user-docs
+
+ The sources of gnome-user-docs-%{gud.version} were downloaded
+ from %{gud.SOURCE0.url}

--- a/copyright/SUNWsolaris-devel-docs.copyright	Fri Sep 19 03:47:59 2008 +0000
+++ b/copyright/SUNWsolaris-devel-docs.copyright	Fri Sep 19 03:59:26 2008 +0000
@@ -1,22 +1,18 @@
 Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
 Use is subject to license terms.
 
-CDDL HEADER START
+--------------------------------------------------------------------
 
-The contents of this file are subject to the terms of the
-Common Development and Distribution License, Version 1.0 only
-(the "License").  You may not use this file except in compliance
-with the License.
+Licensing and copyright information for %{name}:
 
-You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-or http://www.opensolaris.org/os/licensing.
-See the License for the specific language governing permissions
-and limitations under the License.
+ License: Common Development and Distribution License (CDDL)
+ 
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
-When distributing Covered Code, include this CDDL HEADER in each
-file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-If applicable, add the following below this CDDL HEADER, with the
-fields enclosed by brackets "[]" replaced with your own identifying
-information: Portions Copyright [yyyy] [name of copyright owner]
+  COPYING.bz2: CDDL
+  ChangeLog.bz2: list of all changes and authors of devguide
+  REAMDE: more information about devguide
 
-CDDL HEADER END
+ The sources of devguide-%{tarball_version} were downloaded
+ from %{SOURCE0.url}