--- a/ChangeLog	Tue Oct 26 15:59:46 2004 +0000
+++ b/ChangeLog	Tue Oct 26 16:12:34 2004 +0000
@@ -1,3 +1,10 @@
+2004-10-26  Damien Carbery <[email protected]>
+
+	* gok.spec: Integrate updated docs tarball from [email protected].
+	* gnome-user-docs.spec: Updated docs tarball (gnome-user-docs-SAG) from
+	[email protected]. Added '%ifos solaris' to handle this Solaris 
+	version of the tarball.
+
 2004-10-26 Erwann Chenede - <[email protected]>
 	
 	* bootsplash-theme-Sun.spec: copy bootloader sysconfig to the

--- a/gnome-user-docs.spec	Tue Oct 26 15:59:46 2004 +0000
+++ b/gnome-user-docs.spec	Tue Oct 26 16:12:34 2004 +0000
@@ -15,9 +15,10 @@
 Source2:		gnome-user-docs-ORMS-0.5.tar.bz2
 Source3:		quick-start-user-guide-0.5.tar.bz2
 Source4:		gnome-user-docs-SAG-0.12.tar.bz2
-Source5:		gnome-user-docs-AG-0.4.tar.bz2
+Source5:		gnome-user-docs-SAG-0.13solaris.tar.bz2
 Source6:                gnome-user-docs-UG-0.17.tar.bz2
 Source7:                gnome-user-docs-UG-0.19solaris.tar.bz2
+Source8:		gnome-user-docs-AG-0.4.tar.bz2
 Patch1:		   	gnome-user-docs-01-l10n-online-help.diff
 Patch2:		   	gnome-user-docs-02-sun-desktop-section.diff
 Patch3:                 gnome-user-docs-03-add-l10n-docs.diff
@@ -48,8 +49,12 @@
 bzcat %SOURCE6 | tar xvf -
 %endif
 bzcat %SOURCE3 | tar xf -
+%ifos solaris
+bzcat %SOURCE5 | tar xf -
+%else
 bzcat %SOURCE4 | tar xf -
-bzcat %SOURCE5 | tar xf -
+%endif
+bzcat %SOURCE8 | tar xf -
 bzcat %SOURCE2 | tar xf -
 bzcat %SOURCE1 | tar xf -
 %patch2 -p1
@@ -119,6 +124,10 @@
 %{_datadir}/omf/*
 
 %changelog
+* Tue Oct 26 2004 - [email protected]
+- Updated docs tarball (gnome-user-docs-SAG) from [email protected].
+  Added '%ifos solaris' to handle this Solaris version of the tarball.
+
 * Thu Oct 21 2004 - [email protected]
 - #6179792, fix permissions problem with some loading help files.
 

--- a/gok.spec	Tue Oct 26 15:59:46 2004 +0000
+++ b/gok.spec	Tue Oct 26 16:12:34 2004 +0000
@@ -8,7 +8,7 @@
 Summary:      GNOME On-screen Keyboard
 Source:       http://ftp.gnome.org/pub/GNOME/sources/gok/0.11/%{name}-%{version}.tar.bz2
 Source1:      gok-l10n-po-1.2.tar.bz2
-Source2:      gok-docs-0.2.tar.bz2
+Source2:      gok-docs-0.3.tar.bz2
 Patch1:       gok-01-jds-apps.diff
 Patch2:       gok-02-g11n-potfiles.diff 
 Patch3:       gok-03-buildfix.diff
@@ -111,6 +111,9 @@
 %{_sysconfdir}/gconf/schemas/*.schemas
 
 %changelog
+* Tue Oct 26 2004 - [email protected]
+- Integrate updated docs tarball from [email protected].
+
 * Wed Oct 13 2004 - [email protected]
 - Added patch gok-05-fix-strings.diff for bugzilla 155229.