--- a/ChangeLog	Wed Jul 07 10:52:59 2004 +0000
+++ b/ChangeLog	Wed Jul 07 11:33:55 2004 +0000
@@ -1,7 +1,12 @@
-2004-07-06  Damien Carbery <[email protected]>
+2004-07-07  Damien Carbery <[email protected]>
 
 	* patches/gnome-user-docs-04-preface-xml.diff: Add mouseconv.xml to
 	patch as this is now in the UG tarball.
+	* gnome-user-docs.spec: Add new docs tarball
+	(gnome-user-docs-SAG-0.11.tar.bz2) from [email protected]. Add
+	patch gnome-user-docs-06-sag_update.diff to incorporate these docs.
+	* evolution.spec: Updated docs tarball submitted by
+	[email protected].
 
 2004-07-07  Dermot McCluskey <[email protected]>
 

--- a/evolution.spec	Wed Jul 07 10:52:59 2004 +0000
+++ b/evolution.spec	Wed Jul 07 11:33:55 2004 +0000
@@ -20,7 +20,7 @@
 Source:		%{name}-%{version}%{t_suffix}.tar.bz2
 Source1:	mkinstalldirs
 # Docs tarball.
-Source2:	evolution-docs-0.1.tar.bz2
+Source2:	evolution-docs-0.2.tar.bz2
 Patch:		evolution-01-forte-build.diff
 Patch1:		evolution-docs.diff
 #Patch0:         evolution_patch0.diff
@@ -357,6 +357,9 @@
 
 
 %changelog
+* Wed Jul 07 2004 - [email protected]
+- Updated docs tarball submitted by [email protected].
+
 * Wed Jul 07 2004 - [email protected]
 - added "-j $CPUS" to make to speed up builds
 

--- a/gnome-user-docs.spec	Wed Jul 07 10:52:59 2004 +0000
+++ b/gnome-user-docs.spec	Wed Jul 07 11:33:55 2004 +0000
@@ -14,11 +14,13 @@
 Source1:	        gnome2-user-guide-l10n-online-help-0.2.tar.bz2
 Source2:                gnome-user-docs-UG-0.14.tar.bz2
 Source3:		quick-start-user-guide-0.5.tar.bz2
+Source4:		gnome-user-docs-SAG-0.11.tar.bz2
 Patch1:		   	gnome-user-docs-01-add-l10n-online-help.diff
 Patch2:		   	gnome-user-docs-02-sun-desktop-section.diff
 Patch3:                 gnome-user-docs-03-add-l10n-docs.diff
 Patch4:                 gnome-user-docs-04-preface-xml.diff
 Patch5:                 gnome-user-docs-05-omfdestdir.diff
+Patch6:                 gnome-user-docs-06-sag_update.diff
 URL:			http://developer.gnome.org/projects/gdp/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -38,11 +40,13 @@
 rm -Rf gnome2-user-guide/C/figures
 bzcat %SOURCE2 | tar xf -
 bzcat %SOURCE3 | tar xf -
+bzcat %SOURCE4 | tar xf -
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 %ifos linux
@@ -92,6 +96,11 @@
 %{_datadir}/omf/*
 
 %changelog
+* Wed Jul 07 2004 - [email protected]
+- Add new docs tarball (gnome-user-docs-SAG-0.11.tar.bz2) from
+  [email protected]. Add patch gnome-user-docs-06-sag_update.diff to
+  incorporate these docs.
+
 * Wed Jul 07 2004 - [email protected]
 - added "-j $CPUS" to make to speed up builds
 

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-user-docs-06-sag_update.diff	Wed Jul 07 11:33:55 2004 +0000
@@ -0,0 +1,48 @@
+--- gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.am.orig	Wed Jun 23 21:12:56 2004
++++ gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.am	Wed Jun 23 21:16:56 2004
+@@ -3,15 +3,19 @@
+ lang = C
+ omffile = system-admin-guide-C.omf
+ entities = appendixa.xml \
++	   appendixb.xml \
++	   fontconfig.xml \
++	   typeconv.xml \
++	   lockdown.xml \
++	   sundocs.xml \
++	   preface.xml \
+ 	   gconf.xml \
+ 	   glossary.xml \
+ 	   legal.xml \
+ 	   menustructure.xml \
+ 	   mimetypes.xml \
+-	   gdm.xml \
+ 	   performance.xml \
+ 	   screensavers.xml \
+-	   gdm.xml \
+ 	   sessions.xml \
+ 	   help.xml \
+ 	   themes.xml
+--- gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.in.orig	Wed Jun 23 21:13:06 2004
++++ gnome2-user-docs-2.5.0/gnome2-system-admin-guide/C/Makefile.in	Wed Jun 23 21:16:46 2004
+@@ -145,15 +145,19 @@
+ lang = C
+ omffile = system-admin-guide-C.omf
+ entities = appendixa.xml \
++	   appendixb.xml \
++	   lockdown.xml \
++	   fontconfig.xml \
++	   typeconv.xml \
++	   sundocs.xml \
++	   preface.xml \
+ 	   gconf.xml \
+ 	   glossary.xml \
+ 	   legal.xml \
+ 	   menustructure.xml \
+ 	   mimetypes.xml \
+-	   gdm.xml \
+ 	   performance.xml \
+ 	   screensavers.xml \
+-	   gdm.xml \
+ 	   sessions.xml \
+ 	   help.xml \
+ 	   themes.xml