--- a/ChangeLog	Wed Oct 29 16:58:30 2008 +0000
+++ b/ChangeLog	Thu Oct 30 00:00:13 2008 +0000
@@ -1,3 +1,13 @@
+2008-10-29  Ghee Teo <[email protected]>
+	
+	Fixed 6755007. by having a standard way of launching dbus session
+	which also fixes d.o.o.#4097.
+        * SUNWdbus.spec: put 0005.dbus into /etc/X11/xinit/xinitrc.d
+        * SUNWgnome-display-mgr.spec: specified /etc/X11/xinit/xinitrc.d
+        * SUNWgnome-dtlogin-integration.spec: bump to 0.37 and clean up.
+          also put 0005.dbus into /usr/dt/config/Xsession.d when build --with-dt.
+        * ext-sources/0005.dbus:
+
 2008-10-29  Matt Keenan  <[email protected]>
 
 	* base-specs/gnome-menus.spec: Remove invalid indiana branding patch 

--- a/SUNWdbus.spec	Wed Oct 29 16:58:30 2008 +0000
+++ b/SUNWdbus.spec	Thu Oct 30 00:00:13 2008 +0000
@@ -30,6 +30,7 @@
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
 Source1:        dbus.xml
 Source2:        svc-dbus
+Source3:        0005.dbus
 %include default-depend.inc
 Requires:	SUNWdbus-libs
 Requires:	SUNWdbus-root
@@ -111,6 +112,13 @@
 chmod -R 755 $RPM_BUILD_ROOT/lib
 cp %SOURCE2 $RPM_BUILD_ROOT/lib/svc/method/
 
+# Add in dbus session launching for gdm
+install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}
+install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11
+install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit
+install --mode=0755 -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d
+install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d/0005.dbus
+
 mkdir -p $RPM_BUILD_ROOT/etc/security
 echo 'solaris.smf.manage.dbus:::Manage D-BUS Service States::help=SmfDBUSStates.html' > $RPM_BUILD_ROOT/etc/security/auth_attr
 echo 'D-BUS Management:::Manage D-BUS:auths=solaris.smf.manage.dbus;help=RtDBUSMngmnt.html' > $RPM_BUILD_ROOT/etc/security/prof_attr
@@ -206,6 +214,10 @@
 %defattr (-, root, bin)
 %dir %attr (0755, root, sys) %{_sysconfdir}
 %config %{_sysconfdir}/dbus-1
+%dir %attr (0755, root, sys) %{_sysconfdir}/X11
+%dir %attr (0755, root, sys) %{_sysconfdir}/X11/xinit
+%dir %attr (0755, root, sys) %{_sysconfdir}/X11/xinit/xinitrc.d
+%{_sysconfdir}/X11/xinit/xinitrc.d/0005.dbus
 %dir %attr (0755, root, sys) %{_localstatedir}
 %dir %attr (0755, root, other) %{_localstatedir}/lib
 %attr (0755, root, root) %{_localstatedir}/lib/dbus
@@ -237,6 +249,10 @@
 %endif
 
 %changelog
+* Wed Oct 29 2008 - [email protected]
+- Add /etc/X11/xinit/xinitrc.d/0005.dbus to fix 6755007 and d.o.o 4097 so that gdm can 
+  launch dbus session for the user. This can be used for both gdm on nevada and 
+  OpenSolaris.
 * Sun Sep 14 2008 - [email protected]
 - Add new copyright files.
 * Tue Sep 02 2008 - [email protected]

--- a/SUNWgnome-display-mgr.spec	Wed Oct 29 16:58:30 2008 +0000
+++ b/SUNWgnome-display-mgr.spec	Thu Oct 30 00:00:13 2008 +0000
@@ -116,6 +116,10 @@
 rm -fR $RPM_BUILD_ROOT%{_datadir}/xsessions
 %endif
 
+# Create the 'interface' directory so that user's session scripts can be
+# run by gdm and which are populated by other applications.
+install -d $RPM_BUILD_ROOT/%{_sysconfdir}/X11/xinit/xinitrc.d
+
 %if %build_l10n
 %else
 # REMOVE l10n FILES
@@ -222,6 +226,8 @@
 %config %class(preserve) %{_sysconfdir}/X11/gdm/custom.conf
 %{_sysconfdir}/X11/gdm/locale.alias
 %{_sysconfdir}/X11/gdm/modules
+%dir %{_sysconfdir}/X11/xinit
+%dir %{_sysconfdir}/X11/xinit/xinitrc.d
 # don't use %_localstatedir here, because this is an absolute path
 # defined by another package, so it has to be /var/svc even if this
 # package's %_localstatedir is redefined
@@ -243,6 +249,9 @@
 %endif
 
 %changelog
+* Wed Oct 29 2008 - [email protected]
+- Added directory /etc/X11/xinit/xinitrc.d as part of the fix to 6755007 and also
+  d.o.o #4097.
 * Sun Sep 14 2008 - [email protected]
 - Add new copyright files.
 * Tue Jun 24 2008 - [email protected]

--- a/SUNWgnome-dtlogin-integration.spec	Wed Oct 29 16:58:30 2008 +0000
+++ b/SUNWgnome-dtlogin-integration.spec	Thu Oct 30 00:00:13 2008 +0000
@@ -12,7 +12,7 @@
 %define dtlogin_config_basedir /usr
 # NOTE: If the version is bumped the new tarball must be uploaded to the
 #       Sun Download Center. Contact GNOME RE for assistance.
-%define tarball_version 0.36
+%define tarball_version 0.37
 
 %include Solaris.inc
 %if %option_with_dt
@@ -24,13 +24,10 @@
 Summary:                 Desktop startup scripts for JDS
 Source2:                 dtstart
 %endif
+Source3:                 0005.dbus
 Version:                 %{default_pkg_version}
 Source:                  http://dlc.sun.com/osol/jds/downloads/extras/dtlogin-integration-%{tarball_version}.tar.bz2
 Source1:                 l10n-configure.sh
-# date:2008-09-11 owner:fujiwara type:bug bugster:6745785 state:upstream
-Patch1:                  dtlogin-integration-01-vte-cjk.diff
-# date:2008-09-19 owner:gheet type:branding bugster:6750408 
-Patch2:                  dtlogin-integration-02-dbus-launch.diff
 SUNW_BaseDir:            %{dtlogin_config_basedir}
 SUNW_Copyright:          SUNWgnome-dtlogin-integration.copyright
 BuildRoot:               %{_tmppath}/%{name}-%{version}-build
@@ -41,8 +38,6 @@
 
 %prep
 %setup -q -n dtlogin-integration-%{tarball_version}
-%patch1 -p1
-%patch2 -p1
 
 bash -x %SOURCE1 --enable-sun-linguas
 
@@ -81,6 +76,12 @@
 rm -r $RPM_BUILD_ROOT%{dtlogin_config_basedir}/dt/config/Xsession*
 %endif
 
+# Create dbus session initialisation script for dtlogin
+%if %option_with_dt
+install --mode=0755 -d $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d
+install --mode=0755 %SOURCE3 $RPM_BUILD_ROOT/%{dtlogin_config_basedir}/dt/config/Xsession.d/0005.dbus
+%endif
+
 rm -rf $RPM_BUILD_ROOT/tmp
 
 %clean
@@ -95,7 +96,11 @@
 %{_bindir}/dtstart
 %endif
 
+
 %changelog
+* Thu Oct 02 2008 - [email protected]
+- Bump up tarball to 0.37. Removed dtlogin-integration-02-dbus-launch.diff 
+  and dtlogin-integration-01-vte-cjk.diff  which are now upstreamed.
 * Fri Sep 19 2008 - [email protected]
 - Added dtlogin-integration-02-dbus-launch.diff to fix 6750408.
 * Thu Sep 11 2008 - [email protected]

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/ext-sources/0005.dbus	Thu Oct 30 00:00:13 2008 +0000
@@ -0,0 +1,5 @@
+#!/bin/ksh
+
+if [ -x "/usr/bin/dbus-launch" -a -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+        eval `dbus-launch --exit-with-session --sh-syntax`
+fi