INTEGRATION: CWS native141 (1.18.10); FILE MERGED

2008/04/04 10:44:56 obr 1.18.10.2: #i87732# second try
2008/04/03 09:54:40 obr 1.18.10.1: #i87732# rename packages two allow installation in parallel with 2.x

sysui/desktop/mandriva/mandriva-menus.spec

@@ -167,28 +167,6 @@ END
   mv -f /etc/mailcap.tmp$$ /etc/mailcap
 fi
 
-# Check whether to activate the gnome-set-default-application stuff (GNOME < 2.6) 
-if [ "$1" = "1" ]
-then
-  if [ -x /usr/bin/gnome-panel ]
-  then
-    /usr/bin/gnome-panel --version | grep ' 2\.[024]\.' > /dev/null
-    if [ "$?" = "0" ]; then
-      cat >> /usr/bin/%unixfilename.tmp$$ << EOF
-#!/bin/sh
-USERDIR=\`sed -n -e 's/UserInstallation=//p' /etc/%unixfilename/program/bootstraprc | sed -e "s|.SYSUSERCONFIG|\$HOME|"\`
-# Run gnome-set-default-application on first office launch
-if [ ! -d \$USERDIR ]
-then
-  /etc/%unixfilename/program/gnome-set-default-application '%unixfilename' 'application/vnd.oasis.opendocument' 'application/vnd.sun.xml' 'application/vnd.stardivision'
-fi
-EOF
-      sed -n -e '2,$ p' /usr/bin/%unixfilename >> /usr/bin/%unixfilename.tmp$$
-      mv -f /usr/bin/%unixfilename.tmp$$ /usr/bin/%unixfilename
-      chmod 0755 /usr/bin/%unixfilename
-    fi
-  fi
-fi
 %{update_menus}