--- a/MozillaFirefox/MozillaFirefox.changes Sat Oct 25 10:00:57 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes Sat Oct 25 10:49:33 2014 +0200
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Sat Oct 25 08:45:43 UTC 2014 - wr@rosenauer.org
+
+- define /usr/share/myspell as additional dictionary location
+ and remove add-plugins.sh finally (bnc#900639)
+
+-------------------------------------------------------------------
Sun Oct 19 12:59:28 UTC 2014 - vindex17@outlook.it
- use Firefox default optimization flags instead of -Os
--- a/MozillaFirefox/MozillaFirefox.spec Sat Oct 25 10:00:57 2014 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec Sat Oct 25 10:49:33 2014 +0200
@@ -134,7 +134,7 @@
Source10: compare-locales.tar.xz
Source11: firefox.1
Source12: mozilla-get-app-id
-Source13: add-plugins.sh.in
+Source13: spellcheck.js
Source14: create-tar.sh
Source15: firefox-appdata.xml
# Gecko/Toolkit
@@ -391,13 +391,11 @@
mkdir -p %{buildroot}%{progdir}/distribution/extensions
mkdir -p %{buildroot}%{progdir}/browser/searchplugins
mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/
-# install kde.js
+# install gre prefs
+install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/
+# install browser prefs
install -m 644 %{SOURCE6} %{buildroot}%{progdir}/browser/defaults/preferences/kde.js
install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js
-# install add-plugins.sh
-sed "s:%%PROGDIR:%{progdir}:g" \
- %{SOURCE13} > %{buildroot}%{progdir}/add-plugins.sh
-chmod 755 %{buildroot}%{progdir}/add-plugins.sh
# install additional locales
%if %localize
rm -f %{_tmppath}/translations.*
@@ -555,7 +553,6 @@
usr/bin/update-desktop-database > /dev/null || :
fi
%endif
-%{progdir}/add-plugins.sh > /dev/null 2>&1
exit 0
%postun
@@ -573,15 +570,6 @@
%endif
exit 0
-%posttrans
-[ -e %{progdir}/add-plugins.sh ] && \
- %{progdir}/add-plugins.sh > /dev/null 2>&1
-exit 0
-
-%preun
-rm -f %{progdir}/dictionaries/*
-exit 0
-
%files
%defattr(-,root,root)
%dir %{progdir}
@@ -606,7 +594,6 @@
%attr(755,root,root) %{progdir}/%{progname}.sh
%{progdir}/firefox
%{progdir}/firefox-bin
-%{progdir}/add-plugins.sh
%{progdir}/application.ini
%{progdir}/dependentlibs.list
%{progdir}/*.so
--- a/MozillaFirefox/add-plugins.sh.in Sat Oct 25 10:00:57 2014 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,57 +0,0 @@
-#! /bin/sh
-# Copyright (c) 2008 Wolfgang Rosenauer. All rights reserved.
-#
-
-# check if we are started as root
-# only one of UID and USER must be set correctly
-if test "$UID" != 0 -a "$USER" != root; then
- echo "You must be root to start $0."
- exit 1
-fi
-
-PREFIX="%PROGDIR"
-
-# dictionaries
-MYSPELL=/usr/share/myspell
-MOZ_SPELL=$PREFIX/dictionaries
-if [ -d $MOZ_SPELL ] ; then
- if [ -d $MYSPELL ] ; then
- for dict in $MYSPELL/??[-_]??.aff ; do
-
- # check is it is really the file or it is a string which contain '??_??'
- if ! [ -e $dict ] ; then
- continue
- fi
-
- # the dict file name
- dict_file=`echo ${dict##*/}`
-
- # the dict file has a valid name
- lang=`echo ${dict_file:0:2}`
- country=`echo ${dict_file:3:2}`
-
- # check for .dic file
- if [ ! -r $MYSPELL/${lang}[-_]${country}.dic ] ; then
- continue
- fi
-
- # create links
- if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.aff ] ; then
- ln -sf $MYSPELL/${lang}[-_]${country}.aff \
- $MOZ_SPELL/${lang}-${country}.aff
- fi
- if [ ! -r $MOZ_SPELL/${lang}[-_]${country}.dic ] ; then
- ln -sf $MYSPELL/${lang}[-_]${country}.dic \
- $MOZ_SPELL/${lang}-${country}.dic
- fi
- done
- echo "-> added myspell dictionaries"
- fi
-
- # remove broken links
- for dict in $MOZ_SPELL/*.{aff,dic} ; do
- if ! [ -r $dict ] ; then
- rm -f $dict
- fi
- done
-fi
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/MozillaFirefox/spellcheck.js Sat Oct 25 10:49:33 2014 +0200
@@ -0,0 +1,1 @@
+pref("spellchecker.dictionary_path", "/usr/share/myspell");