-Fix GNOME entry for Crux theme applet

- Fix menu entries for simplified menu

2 files changed, 18 insertions, 14 deletions

diff --git a/mandrake_desk.spec b/mandrake_desk.spec
index 8ed0cf6..b1eaf53 100644
--- a/mandrake_desk.spec
+++ b/mandrake_desk.spec
@@ -1,7 +1,7 @@
 Summary:	The Desktop configuration files for Mandrake Linux
 Name:		mandrake_desk
 Version:	9.0
-Release:	3mdk
+Release:	4mdk
 License:	GPL
 URL:		http://www.mandrakelinux.com/
 Group:		System/Configuration/Other
@@ -117,7 +117,7 @@ cd -
 mkdir -p $RPM_BUILD_ROOT{%{_menudir},%{_datadir}/control-center/capplets/Advanced}
 cat << EOF > $RPM_BUILD_ROOT%{_menudir}/mdk-eazel-engine-capplet
 ?package(mdk-eazel-engine-capplet):command="%{_bindir}/eazel-engine-capplet" \
-needs="gnome" section="Configuration/Gnome/Advanced" title="Crux GTK+ Theme" \
+needs="gnome" icon="/usr/share/pixmaps/gnome-ccthemes.png" section="Configuration/GNOME/Advanced" title="Crux GTK+ Theme" \
 longtitle="Configuration applet for Crux GTK+ theme"
 EOF
 cp -f $RPM_BUILD_ROOT%_datadir/gnome/apps/Settings/Desktop/eazel-engine-properties.desktop $RPM_BUILD_ROOT%{_datadir}/control-center/capplets/Advanced
@@ -337,6 +337,10 @@ rm -fr %buildroot
 
 
 %changelog
+* Wed Jul 31 2002 Frederic Crozat <fcrozat@mandrakesoft.com> 9.0-4mdk
+- Fix GNOME entry for Crux theme applet
+- Fix menu entries for simplified menu
+
 * Tue Jul 30 2002 David BAUDENS <baudens@mandrakesoft.com> 9.0-3mdk
 - New default user image
 
diff --git a/menu/mandrake_desk b/menu/mandrake_desk
index 33c93be..fa548b4 100644
--- a/menu/mandrake_desk
+++ b/menu/mandrake_desk
@@ -2,11 +2,11 @@
 # Configure sound settings
 ?package(kdemultimedia): needs="kde" kde_filename="kmix" section="Administer your system" title="Configure sound settings" icon="kmix.png" command="kmix" kde_command="kmix -caption \"%c\" %i %m" mimetypes="" kde_opt="\\nBinaryPattern=kmix;\\nProtocols=\\nDocPath=kmix/index.html\\nTerminalOptions=\\nPath=\\nExtensions=\\nTerminal=0\\nKDE-X-StartupNotify=true"
 
-?package(gnome-media): needs="gnome" section="Administer your system" title="Configure sound settings" command="/usr/bin/gnome-volume-control" icon="/usr/share/gnome/pixmaps/gnome-mixer.png"
+?package(gnome-media): needs="gnome" section="Administer your system" title="Configure sound settings" command="/usr/bin/gnome-volume-control" icon="/usr/share/pixmaps/gnome-mixer.png"
 
 
 # Configure KDE/GNOME
-?package(gnome-control-center): command="/usr/bin/gnomecc" icon="/usr/share/pixmaps/control-center2.png" title="Configure Gnome" needs="gnome" section="Administer your system"
+?package(gnome-control-center): command="/usr/bin/gnome-control-center" icon="/usr/share/pixmaps/control-center2.png" title="Configure Gnome" needs="gnome" section="Administer your system"
 
 ?package(kdebase): needs="kde" kde_filename="KControl" section="Administer your system" title="Configure KDE" icon="kcontrol.png" command="kcontrol" kde_command="kcontrol -caption \"%c\" %i %m" kde_opt="\\nDocPath=kcontrol/index.html\\nX-KDE-StartupNotify=true"
 
@@ -111,15 +111,15 @@
 
 
 # gnome-games
-?package(gnome-games): title="Play FreeCell" command="/usr/bin/freecell" icon="gnome-cardgame.xpm" needs="gnome" section="Play games"
+?package(gnome-games): title="Play FreeCell" command="/usr/bin/freecell" icon="gnome-cardgame.png" needs="gnome" section="Play games"
 
-?package(gnome-games): title="Play Gnome Mines" command="/usr/bin/gnomine" icon="gnome-gnomine.xpm" needs="gnome" section="Play games"
+?package(gnome-games): title="Play Gnome Mines" command="/usr/bin/gnomine" icon="gnome-gnomine.png" needs="gnome" section="Play games"
 
-?package(gnome-games): title="Play Mahjongg" command="/usr/bin/mahjongg" icon="gnome-mahjongg.xpm" needs="gnome" section="Play games"
+?package(gnome-games): title="Play Mahjongg" command="/usr/bin/mahjongg" icon="gnome-mahjongg.png" needs="gnome" section="Play games"
 
-?package(gnome-games): icon="iagno.xpm" title="Play reversi" command="/usr/bin/iagno" needs="gnome" section="Play games"
+?package(gnome-games): icon="iagno.png" title="Play reversi" command="/usr/bin/iagno" needs="gnome" section="Play games"
 
-?package(gnome-games): title="Play solitaire" command="/usr/bin/sol" icon="gnome-aisleriot.xpm" needs="gnome" section="Play games"
+?package(gnome-games): title="Play solitaire" command="/usr/bin/sol" icon="gnome-aisleriot.png" needs="gnome" section="Play games"
 
 
 # kdegames
@@ -291,15 +291,15 @@
 
 
 # StarOffice
-?package(staroffice-de): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-de): title="Make your office work using StarOffice" icon="butterfly.png" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-en): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-en): title="Make your office work using StarOffice" icon="butterfly.png" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-es): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-es): title="Make your office work using StarOffice" icon="butterfly.png" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-fr): title="Make your office work using StarOffice" icon=so52.xpm needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-fr): title="Make your office work using StarOffice" icon="butterfly.png" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
-?package(staroffice-it): title="Make your office work using StarOffice" icon="so52.xpm" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
+?package(staroffice-it): title="Make your office work using StarOffice" icon="butterfly.png" needs="x11" command="soffice" section="Use office tools" mimetypes="application/x-scalc;application/x-smf;application/x-sdraw;application/x-sds;application/x-swriter;application/x-sgl;application/x-sda;audio/x-wav;image/gif;image/jpeg;image/tiff;image/x-xbm;image/x-xpm;text/html;text/plain;"
 
 
 ## View, modify or create a picture