- use system myspell

Changed files:
    mozilla-firefox.spec -> 1.181

diff --git a/mozilla-firefox.spec b/mozilla-firefox.spec
index f6ae0269a7b722e116959931088dc3ff5a90fa34..3c5b57fc093190e20c73f99c7434118d6a2c455a 100644 (file)
--- a/mozilla-firefox.spec
+++ b/mozilla-firefox.spec
@@ -29,6 +29,7 @@ Patch69:      %{name}-agent.patch
 # fixing symptoms only
 # https://bugzilla.mozilla.org/show_bug.cgi?id=362462
 Patch6:                mozilla-hack-gcc_4_2.patch
+Patch7:                %{name}-myspell.patch
 # if ac rebuild is needed...
 #PatchX:               %{name}-ac.patch
 URL:           http://www.mozilla.org/projects/firefox/
@@ -44,6 +45,7 @@ BuildRequires:        libIDL-devel >= 0.8.0
 BuildRequires: libjpeg-devel >= 6b
 BuildRequires: libpng-devel >= 1.2.7
 BuildRequires: libstdc++-devel
+BuildRequires: myspell-devel
 BuildRequires: nspr-devel >= 1:4.6.3
 BuildRequires: nss-devel >= 1:3.11.3-3
 BuildRequires: pango-devel >= 1:1.6.0
@@ -115,6 +117,7 @@ cd mozilla
 %patch3 -p1
 %patch5 -p1
 %patch6 -p2
+%patch7 -p1
 %patch69 -p1
 
 sed -i 's/\(-lgss\)\(\W\)/\1disable\2/' configure
@@ -178,6 +181,7 @@ ac_add_options --disable-updater
 ac_add_options --enable-default-toolkit=gtk2
 ac_add_options --enable-svg
 ac_add_options --enable-system-cairo
+ac_add_options --enable-system-myspell
 ac_add_options --enable-xft
 ac_add_options --with-distribution-id=org.pld-linux
 ac_add_options --with-system-nspr
@@ -211,7 +215,6 @@ install -d \
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
-mv $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries $RPM_BUILD_ROOT%{_datadir}/%{name}/dictionaries
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions $RPM_BUILD_ROOT%{_datadir}/%{name}/extensions
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/icons $RPM_BUILD_ROOT%{_datadir}/%{name}/icons
@@ -220,7 +223,6 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins $RPM_BUILD_ROOT%{_datadir}/%{name}/searchplugins
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
-ln -s ../../share/%{name}/dictionaries $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
 ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
 ln -s ../../share/%{name}/greprefs $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs
 ln -s ../../share/%{name}/icons $RPM_BUILD_ROOT%{_libdir}/%{name}/icons
@@ -228,12 +230,14 @@ ln -s ../../share/%{name}/init.d $RPM_BUILD_ROOT%{_libdir}/%{name}/init.d
 ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res
 ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins
 
+ln -s %{_datadir}/myspell $RPM_BUILD_ROOT%{_libdir}/%{name}/dictionaries
+
 sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox
 
 install browser/base/branding/icon64.png $RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox.png
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # header/development files
 rm $RPM_BUILD_ROOT%{_libdir}/%{name}/xpidl
@@ -268,7 +272,7 @@ EOF
 rm -rf $RPM_BUILD_ROOT
 
 %pre
-for d in chrome defaults dictionaries extensions greprefs icons init.d res searchplugins; do
+for d in chrome defaults extensions greprefs icons init.d res searchplugins; do
        if [ -d %{_libdir}/%{name}/$d ] && [ ! -L %{_libdir}/%{name}/$d ]; then
                install -d %{_datadir}/%{name}
                mv %{_libdir}/%{name}/$d %{_datadir}/%{name}/$d
@@ -330,7 +334,6 @@ fi
 %dir %{_datadir}/%{name}
 %{_datadir}/%{name}/chrome
 %{_datadir}/%{name}/defaults
-%{_datadir}/%{name}/dictionaries
 %{_datadir}/%{name}/greprefs
 %{_datadir}/%{name}/icons
 %{_datadir}/%{name}/init.d
@@ -356,6 +359,3 @@ fi
 %defattr(644,root,root,755)
 %{_datadir}/%{name}/chrome/en-US.jar
 %{_datadir}/%{name}/chrome/en-US.manifest
-# probably should share these with all mozilla apps
-%{_datadir}/%{name}/dictionaries/en-US.aff
-%{_datadir}/%{name}/dictionaries/en-US.dic