Bug 350688 Dictionaries should form part of the locale pack in the installer (os2 part). r=ajschult,sr=neil.

xpinstall/packager/os2/config.it

@@ -166,18 +166,17 @@ C0=Component XPCOM
 C1=Component Navigator
 C2=Component MailNews
 C3=Component PSM
-C4=Component Spellchecker
-C5=Component Chatzilla
-C6=Component Venkman
-C7=Component US English Profile Defaults
-C8=Component En US lang pack
-C9=Component DOM Inspector
-C10=Component Uninstaller
+C4=Component Chatzilla
+C5=Component Venkman
+C6=Component US English Profile Defaults
+C7=Component En US lang pack
+C8=Component DOM Inspector
+C9=Component Uninstaller
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
 ;C11=Component QFA
-C11=Component RPT
-C12=Component SRoaming
+C10=Component RPT
+C11=Component SRoaming
 
 [Setup Type2]
 ;*** LOCALIZE ME BABY ***
@@ -194,18 +193,17 @@ C0=Component XPCOM
 C1=Component Navigator
 C2=Component MailNews
 C3=Component PSM
-C4=Component Spellchecker
-C5=Component Chatzilla
-C6=Component Venkman
-C7=Component US English Profile Defaults
-C8=Component En US lang pack
-C9=Component DOM Inspector
-C10=Component Uninstaller
+C4=Component Chatzilla
+C5=Component Venkman
+C6=Component US English Profile Defaults
+C7=Component En US lang pack
+C8=Component DOM Inspector
+C9=Component Uninstaller
 ; Make sure Component QFA is LAST so 3rd party developers who might not want
 ; this component can easily remove it.
 ;C11=Component QFA
-C11=Component RPT
-C12=Component SRoaming
+C10=Component RPT
+C11=Component SRoaming
 
 
 
@@ -473,17 +471,6 @@ Attributes=SELECTED|FORCE_UPGRADE
 Force Upgrade File0=[SETUP PATH]\msgbsutl.dll
 
 
-[Component Spellchecker]
-Description Short=Spellchecker
-;*** LOCALIZE ME BABY ***
-Description Long=for spellchecking
-Archive=spellcheck.xpi
-$InstallSize$:spellcheck
-$InstallSizeArchive$:spellcheck.xpi
-Attributes=SELECTED|FORCE_UPGRADE
-Force Upgrade File0=[SETUP PATH]\myspell.dll
-
-
 [Component Uninstaller]
 Description Short=$CompanyName$ Uninstaller
 *** LOCALIZE ME BABY ***

xpinstall/packager/os2/makeall.pl

@@ -219,7 +219,6 @@ if(!(-d "$gDirStageProduct"))
 @gComponentList = ("xpcom",
                    "browser",
                    "mail",
-                   "spellcheck",
                    "psm",
                    "chatzilla",
                    "deflenus",

xpinstall/packager/os2/spellcheck.jst

@@ -1,25 +0,0 @@
-var srDest = $SpaceRequired$;
-
-var err = initInstall("SeaMonkey Myspell Spellchecker", "Spellchecker", "$Version$"); 
-logComment("initInstall: " + err);
-
-fProgram  = getFolder("Program");
-logComment("fProgram: " + fProgram)
-
-if (verifyDiskSpace(fProgram, srDest))
-{
-    setPackageFolder(fProgram);
-
-    addDirectory("Spellchecker",
-            "$Version$",
-            "bin",
-            fProgram,
-            "");
-
-    if (err==SUCCESS)
-        performInstall(); 
-    else
-        cancelInstall(err);
-}
-else
-    cancelInstall(INSUFFICIENT_DISK_SPACE);

xpinstall/packager/packages-os2

@@ -20,6 +20,7 @@ bin/chrome/en-US.manifest
 bin/defaults/profile/en-US/*
 bin/defaults/messenger/en-US/*
 bin/searchplugins/*
+bin/dictionaries/*
 
 [deflenus]
 ;
@@ -306,6 +307,11 @@ bin/components/websrvcs.xpt
 bin/components/xulappinfo.js
 bin/components/xulappinfo.xpt
 
+; spellchecker (may not be present)
+bin/components/myspell.dll
+bin/components/spellchk.dll
+bin/components/spellchecker.xpt
+
 ; LDAP components need to be in the browser for AutoConfig
 bin/components/mozldap.dll
 bin/components/mozldap.xpt
@@ -519,12 +525,6 @@ bin/defaults/pref/inspector.js
 bin/res/inspector/viewer-registry.rdf
 bin/res/inspector/search-registry.rdf
 
-[spellcheck]
-bin/components/myspell.dll
-bin/components/spellchk.dll
-bin/components/spellchecker.xpt
-bin/dictionaries/*
-
 [reporter]
 bin/chrome/reporter.jar
 bin/chrome/reporter.manifest