--- a/ChangeLog	Wed Feb 11 09:48:37 2009 +0000
+++ b/ChangeLog	Wed Feb 11 12:20:22 2009 +0000
@@ -1,3 +1,13 @@
+2009-02-11 Matt Keenan <[email protected]>
+
+    * base-specs/gnome-session.spec : Deliver compiz-by-default script and
+      compiz-by-default.desktop file, via compiz-session-integration tarball.
+      resolves bug #6538, where session not startig on sparc because 
+      compiz-by-default does not exist as SUNWcompiz is not delivered on sparc.
+      compiz-by-default needs to be arc independent and therefore delivered
+      via SUNWgnome-session.
+    * SUNWgnome-session.spec : Deliver compiz-by-default
+
 2009-02-11  Dave Lin <[email protected]>
 
 	* base-specs/totem-pl-parser.spec: Set AR=/usr/sfw/bin/gar to fix

--- a/SUNWgnome-session.spec	Wed Feb 11 09:48:37 2009 +0000
+++ b/SUNWgnome-session.spec	Wed Feb 11 12:20:22 2009 +0000
@@ -138,6 +138,7 @@
 %{_bindir}/*
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/gnome-session/helpers/*
+%{_libdir}/compiz-by-default
 %dir %attr (0755, root, sys) %{_datadir}
 %dir %attr (0755, root, other) %{_datadir}/applications
 %{_datadir}/applications/*
@@ -186,6 +187,8 @@
 %endif
 
 %changelog
+* Wed Feb 11 2009 - [email protected]
+- Add /usr/lib/compiz-by-default to %files section
 * Mon Sep 08 2008 - [email protected]
 - Removed ${_datadir}/autostart which is not being used according to spec.
   since autostart for GNOME is under ${_datadir}/gnome/autostart.

--- a/base-specs/gnome-session.spec	Wed Feb 11 09:48:37 2009 +0000
+++ b/base-specs/gnome-session.spec	Wed Feb 11 12:20:22 2009 +0000
@@ -23,6 +23,7 @@
 Source3:                 l10n-configure.sh
 %endif
 Source4:      indiana-splash.jpg
+Source5:      http://www.gnome.org/~erwannc/compiz/compiz-session-integration-6.1.tar.bz2
 #owner:gheet date:2004-08-06 type:bug bugster:5025823
 Patch1:       gnome-session-01-gnome-atom.diff
 %if %option_with_sun_branding
@@ -89,6 +90,7 @@
 cd po-sun; make; cd ..
 cd po-logout; make; cd ..
 %endif
+gtar fxvj %{SOURCE5}
 %patch1 -p1
 %if %option_with_sun_branding
 %patch2 -p1
@@ -163,6 +165,10 @@
 export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
 make DESTDIR=$RPM_BUILD_ROOT install
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
+mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications
+cp compiz-by-default.desktop $RPM_BUILD_ROOT%{_datadir}/applications
+mkdir -p $RPM_BUILD_ROOT%{_libdir}
+cp compiz-by-default $RPM_BUILD_ROOT%{_libdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -184,8 +190,11 @@
 %{_datadir}/gnome/default.wm
 %{_datadir}/applications/
 %{_sysconfdir}/gconf/schemas/*
+%{_libdir}/compiz-by-default
 
 %changelog
+* Wed Feb 11 2009 - [email protected]
+- Integrate compiz-session-integration tarball for compiz-by-default
 * Tue Feb 03 2009 - [email protected]
 - Add 18-compiz-by-default.diff to enable compiz by default
 * Mon Jan 26 2009 - [email protected]