--- a/SUNWmyspell-dictionary-l10n.spec	Fri Jun 08 03:08:03 2007 +0000
+++ b/SUNWmyspell-dictionary-l10n.spec	Fri Jun 08 03:10:49 2007 +0000
@@ -94,7 +94,7 @@
 Summary:                 %{summary} for Czech
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10ncs
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                cs_CZ
 %include default-depend.inc
 
@@ -102,7 +102,7 @@
 Summary:                 %{summary} for German
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nde
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                de
 %include default-depend.inc
 
@@ -110,7 +110,7 @@
 Summary:                 %{summary} for Spanish
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nes
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                es
 %include default-depend.inc
 
@@ -118,7 +118,7 @@
 Summary:                 %{summary} for French
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nfr
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                fr
 %include default-depend.inc
 
@@ -126,7 +126,7 @@
 Summary:                 %{summary} for Hungarian
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nhu
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                hu_HU
 %include default-depend.inc
 
@@ -134,7 +134,7 @@
 Summary:                 %{summary} for Italian
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nit
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                it
 %include default-depend.inc
 
@@ -142,7 +142,7 @@
 Summary:                 %{summary} for Polish
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10npl
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                pl_PL
 %include default-depend.inc
 
@@ -150,7 +150,7 @@
 Summary:                 %{summary} for Portugese Brazilian
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nptbr
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                pt_BR
 %include default-depend.inc
 
@@ -158,7 +158,7 @@
 Summary:                 %{summary} for Russian
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nru
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                ru_RU
 %include default-depend.inc
 
@@ -166,7 +166,7 @@
 Summary:                 %{summary} for Swedish
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version},l10nsv
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                sv
 %include default-depend.inc
 
@@ -174,7 +174,7 @@
 Summary:                 %{summary} for extra languages
 SUNW_BaseDir:            %{_basedir}
 SUNW_Category:           GNOME2,application,%{jds_version}
-SUNW_PkgList:            SUNWgnome-spell,SUNWthunderbird
+SUNW_PkgList:            SUNWfirefox,SUNWgnome-spell,SUNWthunderbird
 SUNW_Loc:                ca_ES,da_DK,el_GR,he_IL,nb_NO,nl_NL,sk_SK,sl_SI
 %include default-depend.inc
 
@@ -203,20 +203,25 @@
 cd myspell-dictionary-%version
 for DICT in `/bin/ls */*.aff */*.dic`
 do
-  install -d $RPM_BUILD_ROOT%_myspelldir
+  if [ ! -d $RPM_BUILD_ROOT%_myspelldir ] ; then
+    install -d $RPM_BUILD_ROOT%_myspelldir
+  fi
   install --mode=0644 $DICT $RPM_BUILD_ROOT%_myspelldir
   ( \
     GNOME_FILE=`basename $DICT`; \
     BROWSER_FILE=`echo $GNOME_FILE | sed -e 's/_/-/'`; \
-    install -d $RPM_BUILD_ROOT%_thunderbirddir; \
+    \
+    if [ ! -d $RPM_BUILD_ROOT%_thunderbirddir ] ; then \
+      install -d $RPM_BUILD_ROOT%_thunderbirddir; \
+    fi; \
     cd $RPM_BUILD_ROOT%_thunderbirddir; \
     ln -s ../../../..%_myspelldir/$GNOME_FILE $BROWSER_FILE; \
-    IS_EN_US=`basename $DICT | grep en_US`; \
-    if [ x$IS_EN_US != x ] ; then \
+    \
+    if [ ! -d $RPM_BUILD_ROOT%_firefoxdir ] ; then \
       install -d $RPM_BUILD_ROOT%_firefoxdir; \
-      cd $RPM_BUILD_ROOT%_firefoxdir; \
-      ln -s ../../../..%_myspelldir/$GNOME_FILE $BROWSER_FILE; \
     fi; \
+    cd $RPM_BUILD_ROOT%_firefoxdir; \
+    ln -s ../../../..%_myspelldir/$GNOME_FILE $BROWSER_FILE; \
   )
 done
 
@@ -278,6 +283,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/cs-*.aff
 %{_thunderbirddir}/cs-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/cs-*.aff
+%{_firefoxdir}/cs-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/cs_CZ
@@ -296,6 +305,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/de-*.aff
 %{_thunderbirddir}/de-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/de-*.aff
+%{_firefoxdir}/de-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/de_DE
@@ -313,6 +326,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/es-*.aff
 %{_thunderbirddir}/es-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/es-*.aff
+%{_firefoxdir}/es-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/es_ES
@@ -330,6 +347,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/fr-*.aff
 %{_thunderbirddir}/fr-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/fr-*.aff
+%{_firefoxdir}/fr-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/fr_FR
@@ -347,6 +368,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/hu-*.aff
 %{_thunderbirddir}/hu-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/hu-*.aff
+%{_firefoxdir}/hu-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/hu_HU
@@ -364,6 +389,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/it-*.aff
 %{_thunderbirddir}/it-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/it-*.aff
+%{_firefoxdir}/it-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/it_IT
@@ -381,6 +410,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/pl-*.aff
 %{_thunderbirddir}/pl-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/pl-*.aff
+%{_firefoxdir}/pl-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/pl_PL
@@ -398,6 +431,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/pt-BR.aff
 %{_thunderbirddir}/pt-BR.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/pt-BR.aff
+%{_firefoxdir}/pt-BR.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/pt_BR
@@ -415,6 +452,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/ru-*.aff
 %{_thunderbirddir}/ru-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/ru-*.aff
+%{_firefoxdir}/ru-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/ru_RU
@@ -432,6 +473,10 @@
 %dir %attr (0755, root, bin) %{_thunderbirddir}
 %{_thunderbirddir}/sv-*.aff
 %{_thunderbirddir}/sv-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/sv-*.aff
+%{_firefoxdir}/sv-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/sv_SE
@@ -477,6 +522,24 @@
 %{_thunderbirddir}/sk-*.dic
 %{_thunderbirddir}/sl-*.aff
 %{_thunderbirddir}/sl-*.dic
+%dir %attr (0755, root, bin) %{_libdir}/firefox
+%dir %attr (0755, root, bin) %{_firefoxdir}
+%{_firefoxdir}/ca-*.aff
+%{_firefoxdir}/ca-*.dic
+%{_firefoxdir}/da-*.aff
+%{_firefoxdir}/da-*.dic
+%{_firefoxdir}/el-*.aff
+%{_firefoxdir}/el-*.dic
+%{_firefoxdir}/he-*.aff
+%{_firefoxdir}/he-*.dic
+%{_firefoxdir}/nb-*.aff
+%{_firefoxdir}/nb-*.dic
+%{_firefoxdir}/nl-*.aff
+%{_firefoxdir}/nl-*.dic
+%{_firefoxdir}/sk-*.aff
+%{_firefoxdir}/sk-*.dic
+%{_firefoxdir}/sl-*.aff
+%{_firefoxdir}/sl-*.dic
 %dir %attr (0755, root, other) %{_docdir}
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary
 %dir %attr (0755, root, bin) %{_docdir}/myspell-dictionary/ca_ES
@@ -499,6 +562,9 @@
 %endif
 
 %changelog
+* Fri Jun 08 2007 - [email protected]
+- Add symbolic links for firefox l10n dictionaries. Fixes 6566162.
+
 * Fri May 18 2007 - [email protected]
 - Remove SUNW_PkgList from base package so that it can be integrated to WOS.