--- a/ChangeLog	Fri Sep 19 02:59:11 2008 +0000
+++ b/ChangeLog	Fri Sep 19 03:12:29 2008 +0000
@@ -1,3 +1,10 @@
+2008-09-19  Rick Ju <[email protected]>
+
+	* SUNWw3m.spec, SUNWlibgsf.spec:
+	* copyright/SUNWw3m.copyright, copyright/SUNWlibgsf.copyright:
+		add %doc section to generate new copyright files and new copyright.
+		and fix a libgsf install issue
+
 2008-09-19  Li Yuan  <[email protected]>
 
 	* SUNWgnome-a11y-reader.spec:

--- a/SUNWlibgsf.spec	Fri Sep 19 02:59:11 2008 +0000
+++ b/SUNWlibgsf.spec	Fri Sep 19 03:12:29 2008 +0000
@@ -154,7 +154,7 @@
 %{_mandir}/man1/*
 %ifarch amd64 sparcv9
 %dir %attr (0755, root, bin) %{_libdir}/%{_arch64}
-%{_libdir}/%{_arch64}/*
+%{_libdir}/%{_arch64}/lib*.so*
 %endif
 
 %files root
@@ -171,6 +171,13 @@
 %{_libdir}/pkgconfig/*
 %dir %attr (0755, root, sys) %{_datadir}
 %{_datadir}/gtk-doc
+%ifarch amd64 sparcv9
+%dir %attr (0755, root, other) %{_libdir}/%{_arch64}/pkgconfig
+%{_libdir}/%{_arch64}/pkgconfig/*
+%endif
+%doc -d %{base_arch}/libgsf-%{libgsf.version} AUTHORS ChangeLog NEWS README
+%doc(bzip2) -d %{base_arch}/libgsf-%{libgsf.version} COPYING COPYING.LIB
+%dir %attr (0755, root, other) %{_datadir}/doc
 
 %if %build_l10n
 %files l10n
@@ -180,6 +187,8 @@
 %endif
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc for copyright files and fix an install issue.
 * Wed Sep 17 2008 - [email protected]
 - Use gio and support 64bit build
 * Tue Sep 02 2008 - [email protected]

--- a/SUNWw3m.spec	Fri Sep 19 02:59:11 2008 +0000
+++ b/SUNWw3m.spec	Fri Sep 19 03:12:29 2008 +0000
@@ -82,6 +82,8 @@
 %dir %attr(0755, root, bin) %{_mandir}
 %dir %attr(0755, root, bin) %{_mandir}/man1
 %{_mandir}/man1/*
+%doc -d w3m-%{w3m.version} ChangeLog NEWS README
+%dir %attr (0755, root, other) %{_datadir}/doc
 
 %if %build_l10n
 %files l10n
@@ -91,6 +93,8 @@
 %endif
 
 %changelog
+* Fri Sep 19 2008 - [email protected]
+- Add %doc for copyright files
 * Thu Aug 06 2008 - [email protected]
 - fix a libm dependency issue #6733315  
 * Thu Jun 05 2008 - [email protected]

--- a/copyright/SUNWlibgsf.copyright	Fri Sep 19 02:59:11 2008 +0000
+++ b/copyright/SUNWlibgsf.copyright	Fri Sep 19 03:12:29 2008 +0000
@@ -1,43 +1,31 @@
 Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
-Use is subject to license terms.
+  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.
 
 --------------------------------------------------------------------
 
- (C) 2001 by Vlad Harchev <[email protected]>
- Copyright (C) 2002,2003,2006 Michael Meeks ([email protected])
- Copyright (C) 2002-2006 Jon K Hellan ([email protected])
- Copyright (C) 2002-2006 Tambet Ingo ([email protected])
- Copyright (C) 2002-2006 Morten Welinder ([email protected])
- Copyright (C) 2002-2006 Rodrigo Moya ([email protected])
- Copyright (C) 2002-2007 Jody Goldberg ([email protected])
- Copyright (C) 2002-2007 Dom Lachowicz ([email protected])
- Copyright (C) 2004-2006 Novell, Inc
- Copyright (C) 2004-2006 Frank Chiulli ([email protected])
- Copyright (C) 2005 Ivan, Wong Yat Cheung <[email protected]>
- Copyright (C) 2005-2006 INdT - Instituto Nokia de Tecnologia
+Licensing and copyright information for libgsf-%{version}:
 
- Author:  Veerapuram Varadhan ([email protected])
- 	    Jody Goldberg ([email protected])
-
- Author:  Luciano Wolf ([email protected])
+ License: GNU General Public License Version 2
+ 
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
- Authors:
-   Federico Mena-Quintero <[email protected]>
-
-
- This program is free software; you can redistribute it and/or
- modify it under the terms of version 2.1 of the GNU Lesser General Public
- License as published by the Free Software Foundation.
+  AUTHORS: List of authors of libgsf
+  COPYING.bz2: GNU GPL v2
+  COPYING.LIBS.bz2: GNU LGPL v2.1
+  ChangeLog: List of the most important changes in libgsf
+  NEWS: List of the news in libgsf
+  README: More information about libgsf
 
- 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 Lesser General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- Foundation, Outc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
- USA
-
+ The sources of libgsf-%{version} were downloaded
+ from %{SOURCE0.url}

--- a/copyright/SUNWw3m.copyright	Fri Sep 19 02:59:11 2008 +0000
+++ b/copyright/SUNWw3m.copyright	Fri Sep 19 03:12:29 2008 +0000
@@ -1,6 +1,20 @@
+ Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
+ Use is subject to license terms. 
 
- Copyright (c) 2000, [email protected]
- Copyright (C) 2002, hito
+--------------------------------------------------------------------
+Licensing and copyright information for w3m-%{w3m.version}:
+
+ License: MIT
+ 
+ You can find more information in the following directory:
+ %{_pkg_docdir}
+
+  ChangeLog: List of the changes in w3m
+  NEWS: List of the news in w3m
+  README: More information about w3m
+
+ The sources of w3m-%{w3m.version} were downloaded
+ from %{w3m.SOURCE0.url}
 
 --------------------------------------------------------------------
 
@@ -29,10 +43,6 @@
  Consortium.
  
 
---------------------------------------------------------------------
-
- by K.Okabe  Aug. 1999 
-
 *************************************************************************
 *
 * Copyright (C) 1993 David E. Steward & Zbigniew Leyk, all rights reserved.
@@ -57,26 +67,3 @@
 *
 **************************************************************************
 
---------------------------------------------------------------------
-
- (C) Copyright 1998-1999 by Akinori Ito
-
- This software may be redistributed freely for this purpose, in full 
- or in part, provided that this entire copyright notice is included 
- on any copies of this software and applications and derivations thereof.
-
- This software is provided on an "as is" basis, without warranty of any
- kind, either expressed or implied, as to any matter including, but not
- limited to warranty of fitness of purpose, or merchantability, or
- results obtained from use of this software.
- 
-
---------------------------------------------------------------------
- 
- by A.ITO  Feb. 1995
- by K.Okabe  Aug. 1999
- 
- You can use,copy,modify and distribute this program without any permission.
- 
---------------------------------------------------------------------
-