--- a/Solaris/ChangeLog	Fri Nov 12 15:40:26 2004 +0000
+++ b/Solaris/ChangeLog	Fri Nov 12 16:11:46 2004 +0000
@@ -21,6 +21,11 @@
 	  GNOME 2.0
 	* SUNWgnome-ui-designer.spec: move to /usr/demo/jds
 
+2004-11-12  Damien Carbery <[email protected]>
+
+	* make-cinnabar-dist: Add SUNWcrash-report packages to NODIST list
+	because bug-buddy is not set to send bug reports to Sun.
+
 2004-11-12  Brian Cameron  <[email protected]>
 
 	* SUNWgnome-performance-meter.spec:  Added spec file for

--- a/Solaris/make-cinnabar-dist	Fri Nov 12 15:40:26 2004 +0000
+++ b/Solaris/make-cinnabar-dist	Fri Nov 12 16:11:46 2004 +0000
@@ -7,7 +7,9 @@
           SUNWgnome-pilot-link-devel SUNWgnome-pilot-link-root 
           SUNWgnome-pilot-link-share SUNWgnome-pilot-link
           SUNWgnome-remote-desktop SUNWgnome-remote-desktop-l10n 
-          SUNWgnome-remote-desktop-root SUNWgnome-remote-desktop-share"
+          SUNWgnome-remote-desktop-root SUNWgnome-remote-desktop-share
+          SUNWgnome-crash-report SUNWgnome-crash-report-l10n
+          SUNWgnome-crash-report-root SUNWgnome-crash-report-share"
 if [ $ARCH != "sparc" ]; then
     NODIST_PKGS="$NODIST_PKGS SUNWacroread"
 fi

--- a/gnome-user-docs.spec	Fri Nov 12 15:40:26 2004 +0000
+++ b/gnome-user-docs.spec	Fri Nov 12 16:11:46 2004 +0000
@@ -12,14 +12,15 @@
 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:	        gnome-user-docs-l10n-online-help-ci.tar.bz2
-Source2:		gnome-user-docs-ORMS-0.5.tar.bz2
+Source2:		gnome-user-docs-AG-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-SAG-0.13solaris.tar.bz2
 Source6:                gnome-user-docs-UG-0.20linux.tar.bz2
 Source7:                gnome-user-docs-UG-0.21solaris.tar.bz2
-Source8:		gnome-user-docs-AG-0.5.tar.bz2
-Source9:		l10n-configure.sh
+Source8:		gnome-user-docs-ORMS-0.6solaris.tar.bz2
+Source9:		gnome-user-docs-ORMS-0.1linux.tar.bz2
+Source10:		l10n-configure.sh
 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
@@ -55,8 +56,12 @@
 %else
 bzcat %SOURCE4 | tar xf -
 %endif
+bzcat %SOURCE2 | tar xf -
+%ifos solaris
 bzcat %SOURCE8 | tar xf -
-bzcat %SOURCE2 | tar xf -
+%else
+bzcat %SOURCE9 | tar xf -
+%endif
 bzcat %SOURCE1 | tar xf -
 %patch2 -p1
 # %patch3 -p1
@@ -67,7 +72,7 @@
 %patch8 -p1
 %patch1 -p1
 
-bash -x %SOURCE9
+bash -x %SOURCE10
 
 %build
 %ifos linux
@@ -130,6 +135,8 @@
 * Fri Nov 12 2004 - [email protected]
 - Updated docs tarball (gnome-user-docs-UG-0.21solaris) from 
   [email protected].
+- Updated docs tarball (gnome-user-docs-ORMS) from [email protected].
+  Added '%ifos solaris' to handle this Solaris version of the tarball.
 
 * Thu Nov 11 2004 - [email protected]
 - Update docs tarball (gnome-user-docs-AG-0.5) from [email protected]. Update