--- a/ChangeLog	Wed Sep 03 11:21:08 2008 +0000
+++ b/ChangeLog	Wed Sep 03 12:35:36 2008 +0000
@@ -1,3 +1,10 @@
+2008-09-03  Dermot McCluskey  <[email protected]>
+
+	* base-specs/gqview.spec: Modify
+	* patches/gnome-commander-01-desktop-menu.diff: Modify
+	* patches/gqview-04-desktop.diff: Remove
+	  Undo previous changes to remove new apps from Launch menu
+
 2008-09-03  Ghee Teo  <[email protected]>
 
 	Added gnome-session-15-show-splash.diff, a branding patch to enable 

--- a/base-specs/gqview.spec	Wed Sep 03 11:21:08 2008 +0000
+++ b/base-specs/gqview.spec	Wed Sep 03 12:35:36 2008 +0000
@@ -22,8 +22,6 @@
 Patch2:       gqview-02-manpage.diff
 #owner:bewitche data:2008-08-21 bugid:2063964 type:bug
 Patch3:	      gqview-03-remote.diff
-#owner:dermotm data:2008-09-01 type:branding
-Patch4:	      gqview-04-desktop.diff
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 
 URL: http://gqview.sourceforge.net
@@ -41,7 +39,6 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
-%patch4 -p1
 %build
 CPUS=`/usr/sbin/psrinfo | grep on-line | wc -l | tr -d ' '`
 if test "x$CPUS" = "x" -o $CPUS = 0; then
@@ -74,6 +71,8 @@
 %{_mandir}/man?/*
 
 %changelog
+* Wed Sep 03 2008  [email protected]
+- Remove gqview-04-desktop.diff - menu entry required for OpenSolaris
 * Mon Sep 01 2008  [email protected]
 - Add gqview-04-desktop.diff to remove from Launch menu
 * Wed Aug 21 2008  [email protected]

--- a/patches/gnome-commander-01-desktop-menu.diff	Wed Sep 03 11:21:08 2008 +0000
+++ b/patches/gnome-commander-01-desktop-menu.diff	Wed Sep 03 12:35:36 2008 +0000
@@ -1,13 +1,12 @@
 --- gnome-commander-1.2.7/data/gnome-commander.desktop.in.in.orig	2008-09-01 16:01:38.398703800 +0100
 +++ gnome-commander-1.2.7/data/gnome-commander.desktop.in.in	2008-09-01 16:03:23.144318100 +0100
-@@ -6,8 +6,9 @@
+@@ -6,8 +6,8 @@
  Icon=gnome-commander
  Terminal=false
  Type=Application
 -Categories=GNOME;GTK;Application;Utility;FileManager;
 +Categories=GNOME;System;FileManager;
  StartupNotify=true
-+NoDisplay=true
  X-GNOME-Bugzilla-Bugzilla=GNOME
  X-GNOME-Bugzilla-Product=gnome-commander
  X-GNOME-Bugzilla-Component=application

--- a/patches/gqview-04-desktop.diff	Wed Sep 03 11:21:08 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
---- gqview-2.0.4/gqview.desktop.orig	2008-09-01 16:05:30.251260700 +0100
-+++ gqview-2.0.4/gqview.desktop	2008-09-01 16:05:50.574238800 +0100
-@@ -19,3 +19,4 @@
- Encoding=UTF-8
- Categories=Application;Graphics;Viewer;
- MimeType=application/x-navi-animation;image/bmp;image/x-bmp;image/x-MS-bmp;image/gif;image/x-icon;image/jpeg;image/png;image/x-portable-anymap;image/x-portable-bitmap;image/x-portable-graymap;image/x-portable-pixmap;image/x-cmu-raster;image/x-sun-raster;image/x-tga;image/tiff;image/vnd.wap.wbmp;image/x-xbitmap;image/x-xpixmap;image/svg;image/svg+xml;image/x-png;image/xpm;image/x-ico;image/x-pcx;
-+NoDisplay=true