--- a/ChangeLog	Thu Jun 10 10:13:30 2004 +0000
+++ b/ChangeLog	Thu Jun 10 10:37:31 2004 +0000
@@ -1,3 +1,10 @@
+2004-06-10  Damien Carbery <[email protected]>
+
+	* gnome-user-docs.spec: Incorporate new docs tarball from
+	[email protected]
+	* gnome-user-docs-04-preface-xml.diff: Update patch because Makefile.am
+	removed from docs tarball. Now patching file from community tarball.
+
 2004-06-10  Matt Keenan <[email protected]>
 
 	* javahelp-convert.spec: Update to 0.9, add javahelpsection script

--- a/gnome-user-docs.spec	Thu Jun 10 10:13:30 2004 +0000
+++ b/gnome-user-docs.spec	Thu Jun 10 10:37:31 2004 +0000
@@ -12,7 +12,7 @@
 Summary:		User Documentation for the GNOME desktop
 Source:		        http://ftp.gnome.org/pub/GNOME/sources/gnome2-user-docs/2.0/gnome2-user-docs-%{version}.tar.bz2	
 Source1:	        gnome2-user-guide-l10n-online-help-0.2.tar.bz2
-Source2:                gnome-user-docs-UG-0.10.tar.bz2
+Source2:                gnome-user-docs-UG-0.11.tar.bz2
 Source3:		quick-start-user-guide-0.5.tar.bz2
 Patch1:		   	gnome-user-docs-01-add-l10n-online-help.diff
 Patch2:		   	gnome-user-docs-02-sun-desktop-section.diff
@@ -79,6 +79,8 @@
 %{_datadir}/omf/*
 
 %changelog
+* Thu Jun 10 2004 - [email protected]
+- Incorporate new docs tarball from [email protected]
 * Fri May 28 2004 - [email protected]
 - Incorporate new docs tarball from [email protected]
 * Tue May 04 2004 - [email protected]

--- a/patches/gnome-user-docs-04-preface-xml.diff	Thu Jun 10 10:13:30 2004 +0000
+++ b/patches/gnome-user-docs-04-preface-xml.diff	Thu Jun 10 10:37:31 2004 +0000
@@ -1,11 +1,10 @@
---- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig	2004-05-28 16:51:58.453169000 +0100
-+++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am	2004-05-28 16:54:44.323841000 +0100
-@@ -2,7 +2,7 @@
+--- gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am.orig	Thu Jun 10 11:27:58 2004
++++ gnome2-user-docs-2.5.0/gnome2-user-guide/C/Makefile.am	Thu Jun 10 11:29:35 2004
+@@ -1,6 +1,6 @@
+ 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 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)
++entities = legal.xml glossary.xml goscustaccess.xml goscustdesk.xml goscustlookandfeel.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml $(wgos_files) appendix.xml preface.xml sundocs.xml typeconv.xml
+ 
+ figdir = figures
  docname = user-guide
- lang = C
- omffile = user-guide-C.omf
--entities = legal.xml glossary.xml gosbasic.xml jdsstartapps.xml goscustdesk.xml jdsstartpreftools.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml part1.xml part2.xml part3.xml 
-+entities = legal.xml glossary.xml goscustdesk.xml gosdeskback.xml goseditmainmenu.xml gosmetacity.xml gosnautilus.xml gosoverview.xml gospanel.xml gosstartsession.xml appendix.xml nautilus.xml
- include $(top_srcdir)/xmldocs.make
- #omf_dest_dir=$(datadir)/omf/$(docname)
- #