--- a/ChangeLog	Thu Nov 25 15:21:05 2004 +0000
+++ b/ChangeLog	Thu Nov 25 15:43:13 2004 +0000
@@ -1,3 +1,11 @@
+2004-11-25  Damien Carbery <[email protected]>
+
+	* gnome-user-docs.spec: Fix 6197944: Add Linux-specific patches to 
+	remove references to files not in the Linux docs tarballs and add files
+	that are (but are not in Solaris tarball).
+	* patches/gnome-user-docs-09-linux-user-guide.diff: Fix 6197944.
+	* patches/gnome-user-docs-10-sag_linux.diff: Fix 6197944.
+
 2004-11-25  Dermot McCluskey <[email protected]>
 
 	* evolution.spec, hydrogen.spec: re-enabled IDN support

--- a/gnome-user-docs.spec	Thu Nov 25 15:21:05 2004 +0000
+++ b/gnome-user-docs.spec	Thu Nov 25 15:43:13 2004 +0000
@@ -29,6 +29,8 @@
 Patch6:                 gnome-user-docs-06-sag_update.diff
 Patch7:                 gnome-user-docs-07-access_guide.diff
 Patch8:                 gnome-user-docs-08-orms.diff
+Patch9:                 gnome-user-docs-09-linux-user-guide.diff
+Patch10:                gnome-user-docs-10-sag_linux.diff
 URL:			http://developer.gnome.org/projects/gdp/
 BuildRoot:		%{_tmppath}/%{name}-%{version}-build
 Docdir:			%{_defaultdocdir}/doc
@@ -65,9 +67,17 @@
 bzcat %SOURCE1 | tar xf -
 %patch2 -p1
 # %patch3 -p1
+%ifos solaris
 %patch4 -p1
+%else
+%patch9 -p1
+%endif
 %patch5 -p1
+%ifos solaris
 %patch6 -p1
+%else
+%patch10 -p1
+%endif
 %patch7 -p1
 %patch8 -p1
 %patch1 -p1
@@ -132,6 +142,10 @@
 %{_datadir}/omf/*
 
 %changelog
+* Thu Nov 25 2004 - [email protected]
+- Fix 6197944: Add Linux-specific patches to remove references to files not in
+  the Linux docs tarballs and add files that are (but not in Solaris tarball).
+
 * Fri Nov 12 2004 - [email protected]
 - Updated docs tarball (gnome-user-docs-UG-0.21solaris) from 
   [email protected].

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-user-docs-09-linux-user-guide.diff	Thu Nov 25 15:43:13 2004 +0000
@@ -0,0 +1,16 @@
+--- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig	Thu Jun 10 16:45:49 2004
++++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am	Thu Jun 10 16:48:13 2004
+@@ -1,6 +1,5 @@
+-wgos_files = wgosbasic.xml wgoscustaccess.xml wgoscustdesk.xml wgoscustlookandfeel.xml wgosdeskback.xml wgoseditmainmenu.xml wgosmetacity.xml wgosnautilus.xml wgosoverview.xml wgospanel.xml wgosstartsession.xml
++entities = legal.xml glossary.xml goscustdesk.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gospanel.xml gosstartsession.xml appendix.xml preface.xml sundocs.xml typeconv.xml mouseconv.xml platformnote.xml
+ 
+-entities = legal.xml glossary.xml gosbasic.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml $(wgos_files)
+ 
+ figdir = figures
+ docname = user-guide
+@@ -13,5 +12,3 @@
+ 
+ dist-hook: app-dist-hook
+ 
+-$(wgos_files):
+-	ln -sf user-guide.xml $@

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/gnome-user-docs-10-sag_linux.diff	Thu Nov 25 15:43:13 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