--- a/ChangeLog	Wed Apr 04 00:22:36 2007 +0000
+++ b/ChangeLog	Wed Apr 04 01:05:35 2007 +0000
@@ -1,3 +1,14 @@
+2007-04-04  Glynn Foster  <[email protected]>
+
+        Part fix for #6537601, several desktop files need to be modified to
+        match UI specs
+	* SUNWgnome-gui-test.spec: Remove at-spi browser and dogtail.
+	* SUNWgnome-utils.spec: Remove dictionary.
+	* patches/gnome-menus-03-preferences.diff: Add accessibilty related
+        items back into the preference menu
+	* patches/nautilus-09-interface-changes.diff: Update, to remove file
+        browser.
+
 2007-04-04  Glynn Foster  <[email protected]>
 
 	* base-specs/gtkam.spec: Update, fixes #6532852.

--- a/SUNWgnome-gui-test.spec	Wed Apr 04 00:22:36 2007 +0000
+++ b/SUNWgnome-gui-test.spec	Wed Apr 04 01:05:35 2007 +0000
@@ -39,6 +39,9 @@
 %dogtail.install -d %name-%version
 
 %{?pkgbuild_postprocess: %pkgbuild_postprocess -v -c "%{version}:%{jds_version}:%{name}:$RPM_ARCH:%(date +%%Y-%%m-%%d):%{support_level}" $RPM_BUILD_ROOT}
+#Remove AT-API browser and dogtail from the menus
+rm -r $RPM_BUILD_ROOT%{_datadir}/applications/sniff.desktop
+rm -r $RPM_BUILD_ROOT%{_datadir}/applications/dogtail-recorder.desktop
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,8 +64,6 @@
 %dir %attr (0755, root, bin) %{_libdir}
 %{_libdir}/*
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/*
 %dir %attr (0755, root, other) %{_datadir}/doc
 %{_datadir}/doc/*
 %{_datadir}/dogtail

--- a/SUNWgnome-utils.spec	Wed Apr 04 00:22:36 2007 +0000
+++ b/SUNWgnome-utils.spec	Wed Apr 04 01:05:35 2007 +0000
@@ -186,7 +186,8 @@
 
 rm $RPM_BUILD_ROOT%{_libdir}/gnome-system-log/plugins/*.la
 
-# Remve gnome-dictionary developer files and documentation.
+# Remve gnome-dictionary menu entry, developer files and documentation.
+rm -r $RPM_BUILD_ROOT%{_datadir}/applications/gnome-dictionary.desktop
 rm -r $RPM_BUILD_ROOT%{_datadir}/gnome-system-log
 rm -r $RPM_BUILD_ROOT%{_datadir}/gtk-doc
 rm -r $RPM_BUILD_ROOT%{_includedir}/gdict*
@@ -481,8 +482,6 @@
 %{_libdir}/bonobo/servers/GNOME_DictionaryApplet.server
 %{_libexecdir}/gnome-dictionary-applet
 %dir %attr (0755, root, sys) %{_datadir}
-%dir %attr (0755, root, other) %{_datadir}/applications
-%{_datadir}/applications/gnome-dictionary.desktop
 %dir %attr (0755, root, other) %{_datadir}/gnome
 %{_datadir}/gnome/help/gnome-dictionary/C
 %{_datadir}/omf/gnome-dictionary/gnome-dictionary-C.omf

--- a/patches/gnome-menus-03-preferences.diff	Wed Apr 04 00:22:36 2007 +0000
+++ b/patches/gnome-menus-03-preferences.diff	Wed Apr 04 01:05:35 2007 +0000
@@ -1,7 +1,15 @@
-diff -urN gnome-menus-2.17.92/layout/preferences.menu gnome-menus-2.17.92-hacked/layout/preferences.menu
---- gnome-menus-2.17.92/layout/preferences.menu	2007-02-27 09:41:04.000000000 +1300
-+++ gnome-menus-2.17.92-hacked/layout/preferences.menu	2007-03-07 16:55:58.294920000 +1300
-@@ -30,16 +30,4 @@
+diff -urN gnome-menus-2.18.0/layout/preferences.menu gnome-menus-2.18.0-hacked/layout/preferences.menu
+--- gnome-menus-2.18.0/layout/preferences.menu	2007-03-13 07:49:27.000000000 +1300
++++ gnome-menus-2.18.0-hacked/layout/preferences.menu	2007-04-04 13:00:27.589407000 +1200
+@@ -19,7 +19,6 @@
+       <Not>
+         <Or>
+           <Category>System</Category>
+-          <Category>Accessibility</Category>
+         </Or>
+       </Not>
+     </And>
+@@ -30,16 +29,4 @@
      <Filename>gnomecc.desktop</Filename>
    </Exclude>
  
@@ -18,9 +26,9 @@
 -  </Menu>
 -
  </Menu>     <!-- End Prefs -->
-diff -urN gnome-menus-2.17.92/layout/settings.menu gnome-menus-2.17.92-hacked/layout/settings.menu
---- gnome-menus-2.17.92/layout/settings.menu	2007-02-27 09:41:04.000000000 +1300
-+++ gnome-menus-2.17.92-hacked/layout/settings.menu	2007-03-07 16:56:17.672382000 +1300
+diff -urN gnome-menus-2.18.0/layout/settings.menu gnome-menus-2.18.0-hacked/layout/settings.menu
+--- gnome-menus-2.18.0/layout/settings.menu	2007-03-13 07:49:27.000000000 +1300
++++ gnome-menus-2.18.0-hacked/layout/settings.menu	2007-04-04 13:00:19.697431000 +1200
 @@ -3,8 +3,8 @@
  
  <Menu>

--- a/patches/nautilus-09-interface-changes.diff	Wed Apr 04 00:22:36 2007 +0000
+++ b/patches/nautilus-09-interface-changes.diff	Wed Apr 04 01:05:35 2007 +0000
@@ -754,3 +754,14 @@
  	window->details->ui_manager = gtk_ui_manager_new ();
  	ui_manager = window->details->ui_manager;
  	gtk_window_add_accel_group (GTK_WINDOW (window),
+diff -urN nautilus-2.18.0.1/nautilus.desktop.in.in nautilus-2.18.0.1-hacked/nautilus.desktop.in.in
+--- nautilus-2.18.0.1/nautilus.desktop.in.in	2007-03-12 23:32:43.000000000 +1300
++++ nautilus-2.18.0.1-hacked/nautilus.desktop.in.in	2007-04-04 12:54:46.883033000 +1200
+@@ -6,6 +6,7 @@
+ Exec=nautilus --no-desktop --browser %U
+ Icon=file-manager
+ Terminal=false
++NoDisplay=true
+ StartupNotify=true
+ Type=Application
+ Categories=GNOME;GTK;System;Utility;Core;