Index: apkg-script-utils =================================================================== RCS file: /pack/anoncvs/autopackage/main/share/apkg-script-utils,v retrieving revision 1.229 diff -u -3 -p -u -r1.229 apkg-script-utils --- apkg-script-utils 2006/11/02 22:10:14 1.229 +++ apkg-script-utils 2006/11/04 05:17:50 @@ -2480,6 +2480,7 @@ function _processTriggers() { function _setupDesktopFile() { local adjust_path="$1" local F="$2" + local categories_value category category_add if $adjust_path; then trace Adjusting path for $F... @@ -2507,6 +2508,29 @@ function _setupDesktopFile() { trace adding X-Red-Hat-Base to $F... addSectionLine "$F" "Desktop Entry" "Categories=${categories_value}X-Red-Hat-Base;" "^Categories=" fi + + # mandriva category mangling area - compatibility till full implementation of xdg + if [[ "$AUTOPACKAGE_DISTRIBUTION_ID" == "mandriva" ]]; then + for category in `echo $categories_value | sed 's/\;/ /g'`; do + case $category in + Audio ) category_add="X-MandrivaLinux-Multimedia-Sound";; + AudioVideo ) category_add="X-MandrivaLinux-Multimedia";; + Audio ) category_add="X-MandrivaLinux-Multimedia-Sound";; + Video ) category_add="X-MandrivaLinux-Multimedia-Video";; + Development ) category_add="X-MandrivaLinux-MoreApplications-Development";; + Education ) category_add="X-MandrivaLinux-MoreApplications-Education";; + Game ) category_add="X-MandrivaLinux-MoreApplications-Games";; + Graphics ) category_add="X-MandrivaLinux-Multimedia-Graphics";; + Network ) category_add="X-MandrivaLinux-Internet";; + Office ) category_add="X-MandrivaLinux-Office";; + Settings ) category_add="X-MandrivaLinux-System-Configuration";; + System ) category_add="X-MandrivaLinux-System";; + Utility ) category_add="X-MandrivaLinux-System";; + esac + [ -n "$category_add" ] && addSectionLine "$F" "Desktop Entry" "Categories=${categories_value}${category_add};" "^Categories=" + done + fi + elif (( cat_count > 1 )); then err "installMenuItem: desktop file $F has more than 1 'Categories' keys in the Desktop Entry section." fi