--- a/ChangeLog	Wed Sep 10 10:30:12 2008 +0000
+++ b/ChangeLog	Wed Sep 10 10:45:45 2008 +0000
@@ -1,3 +1,8 @@
+2008-09-10  Padraig O'Briain  <[email protected]>
+
+	* SUNWgnome-config.spec: Add %doc to %files
+	* copyright/SUNWgnome-config.copyright: Updated for new copyright
+
 2008-09-10  John Rice  <[email protected]>
 	Comitted by: Michal Pryc <[email protected]>
 	* patches/glib-java-01-registerLogHandler.diff: #6728675 glib-java's 

--- a/SUNWgnome-config.spec	Wed Sep 10 10:30:12 2008 +0000
+++ b/SUNWgnome-config.spec	Wed Sep 10 10:45:45 2008 +0000
@@ -112,6 +112,9 @@
 rm -rf $RPM_BUILD_ROOT
 
 %files
+%doc -d %{base_arch}/GConf-%{gconf.version} README
+%doc(bzip2) -d %{base_arch}/GConf-%{gconf.version} COPYING NEWS ChangeLog
+%dir %attr (0755, root, other) %{_datadir}/doc
 %defattr (-, root, bin)
 %dir %attr (0755, root, bin) %{_bindir}
 %{_bindir}/gconftool-2
@@ -168,6 +171,8 @@
 %endif
 
 %changelog
+* Wed Sep 10 2008 - [email protected]
+- Add %doc to %files for copyright
 * Wed Aug 06 2008 - [email protected]
 - Bug 6703986 : Remove references to /usr/lib/ST/64
 * Wed Jun 04 2008 - [email protected]

--- a/copyright/SUNWgnome-config.copyright	Wed Sep 10 10:30:12 2008 +0000
+++ b/copyright/SUNWgnome-config.copyright	Wed Sep 10 10:45:45 2008 +0000
@@ -8,36 +8,19 @@
 
 --------------------------------------------------------------------
 
-
- Copyright (C) 1999, 2000 Red Hat Inc.
- Copyright (C) 2005 Red Hat Inc.
- Copyright (C) 2005 Novell, Inc
+Licensing and copyright information for %{name}:
 
- Developed by Havoc Pennington, some code in here borrowed from 
- gnome-name-server and libgnorba (Elliot Lee)
+ License: GNU Lesser General Public License Version 2
 
- Copyright (C) 2001 Sun Microsystems, Inc.
- Copyright (C) 1999 - 2001 Red Hat Inc.
- Copyright (C) 1999, 2000, 2002 Red Hat Inc.
- Copyright (C) 2002 Red Hat Inc.
- Copyright (C) 2005 Mark McLoughlin
- Copyright (C) 1999, 2000, 2000 Red Hat Inc.
+ You can find more information in the following directory:
+ %{_pkg_docdir}
 
- 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.
+ COPYING.bz2: GNU LGPL
+ NEWS.bz2: list of all important changes in GConf
+ ChangeLog.bz2 list of all changes and authors of GConf
+ README: more information about GConf
 
- 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.
+ The sources of GConf-%{gconf.version} were downloaded
+ from %{gconf.SOURCE0.url}
+  
 
- 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.
-
-
---------------------------------------------------------------------
-