rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

WIP - default langpack fix

Browse Source
This commit is contained in:
Martin Stransky 2012-07-10 10:35:34 +02:00
parent 1a49edbdc1
commit a62de3b295
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
firefox.sh.in
View File

@ -189,8 +189,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES} CURRENT_LOCALE=${CURRENT_LOCALE:-$LC_MESSAGES}
CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG} CURRENT_LOCALE=${CURRENT_LOCALE:-$LANG}
# Try without a local variant first, then with a local variant # Try with a local variant first, then without a local variant
# So that pt-BR doesn't try to use pt for example
SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"` SHORTMOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*||g"`
MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"` MOZLOCALE=`echo $CURRENT_LOCALE | sed "s|_\([^.]*\).*|-\1|g"`
@ -207,7 +206,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
return 1 return 1
} }
create_langpack_link $SHORTMOZLOCALE || create_langpack_link $MOZLOCALE || true create_langpack_link $MOZLOCALE || create_langpack_link $SHORTMOZLOCALE || true
fi fi
# Prepare command line arguments # Prepare command line arguments

11
firefox.spec
View File

@ -282,6 +282,17 @@ done
%{__rm} -rf firefox-langpacks %{__rm} -rf firefox-langpacks
%endif # build_langpacks %endif # build_langpacks
# Install langpack workaround (see #707100, #821169)
function create_default_langpack() {
language_long=$1
language_short=$2
cd $RPM_BUILD_ROOT%{langpackdir}
ln -s langpack-$language_long@firefox.mozilla.org.xpi langpack-$language_short@firefox.mozilla.org.xpi
cd -
}
# Test that we have all langpacks in default setup
# System extensions # System extensions
%{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id} %{__mkdir_p} $RPM_BUILD_ROOT%{_datadir}/mozilla/extensions/%{firefox_app_id}
%{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id} %{__mkdir_p} $RPM_BUILD_ROOT%{_libdir}/mozilla/extensions/%{firefox_app_id}