--- a/ChangeLog	Mon Oct 26 19:55:38 2009 +0000
+++ b/ChangeLog	Mon Oct 26 23:27:42 2009 +0000
@@ -1,3 +1,13 @@
+2009-10-26  Brian Cameron  <[email protected]>
+
+	* SUNWgnome-display-mgr: Fix packaging.
+	* base-specs/gdm.spec: Do not ship the
+	  polkit-gnome-authentication-agent.desktop file since it is not
+	  supported on Solaris.
+	* patches/gdm-01-branding.diff:  Enable a11y, and fix a bug where
+	  the at-spi-registryd-wrapper.in.in file was trying to launch
+	  at-spi-registryd from the wrong path.
+
 2009-10-26  Brian Cameron  <[email protected]>
 
 	* base-specs/gdm.spec, patches/gdm-18-setfacl.diff:  Add patch so

--- a/SUNWgnome-display-mgr.spec	Mon Oct 26 19:55:38 2009 +0000
+++ b/SUNWgnome-display-mgr.spec	Mon Oct 26 23:27:42 2009 +0000
@@ -207,7 +207,7 @@
 # redefined.
 %dir %attr (0755, root, sys) /var
 %dir %attr (0755, root, sys) /var/log
-%dir %attr (0750, root, root) /var/log/gdm
+%dir %attr (1770, root, gdm) /var/log/gdm
 /var/svc/*
 # SVC method file
 %dir %attr (0755, root, bin) /lib

--- a/base-specs/gdm.spec	Mon Oct 26 19:55:38 2009 +0000
+++ b/base-specs/gdm.spec	Mon Oct 26 23:27:42 2009 +0000
@@ -151,6 +151,7 @@
 rm $RPM_BUILD_ROOT/%{_libexecdir}/gdm-product-slave
 rm $RPM_BUILD_ROOT/%{_sbindir}/gdm-restart
 rm $RPM_BUILD_ROOT/%{_sbindir}/gdm-safe-restart
+rm $RPM_BUILD_ROOT/%{_datadir}/gdm/autostart/LoginWindow/polkit-gnome-authentication-agent-1.desktop
 
 # The /var/run directory should not be included with the packages.
 # GDM will create it at run-time.

--- a/patches/gdm-01-branding.diff	Mon Oct 26 19:55:38 2009 +0000
+++ b/patches/gdm-01-branding.diff	Mon Oct 26 23:27:42 2009 +0000
@@ -22,3 +22,30 @@
        <locale name="C">
          <short>Do not show known users in the login window</short>
          <long>Set to true to disable showing known users in the login window.</long>
+--- gdm-2.28.1/data/session-setup.entries-orig	2009-10-26 16:01:20.789224457 -0500
++++ gdm-2.28.1/data/session-setup.entries	2009-10-26 16:04:34.518041811 -0500
+@@ -392,6 +392,13 @@
+     </entry>
+ 
+     <entry>
++      <key>/desktop/gnome/interface/accessibility</key>
++      <value>
++        <bool>true</bool>
++      </value>
++    </entry>
++
++    <entry>
+       <key>/desktop/gnome/accessibility/keyboard/enable</key>
+       <value>
+         <bool>true</bool>
+--- gdm-2.28.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in-orig	2009-10-26 18:09:05.303906694 -0500
++++ gdm-2.28.1/data/greeter-autostart/at-spi-registryd-wrapper.desktop.in.in	2009-10-26 18:08:15.704234734 -0500
+@@ -1,7 +1,7 @@
+ [Desktop Entry]
+ Type=Application
+ _Name=AT SPI Registry Wrapper
+-Exec=/usr/libexec/at-spi-registryd
++Exec=@LIBEXECDIR@/at-spi-registryd
+ OnlyShowIn=GNOME;
+ AutostartCondition=GNOME /desktop/gnome/interface/accessibility
+ X-GNOME-Autostart-Phase=Initialization