Fixed /usr in launch scripts to allow run in container
This commit is contained in:
Martin Stransky
parent
cb313562d6
commit
0813120c79
@ -4,4 +4,4 @@
|
||||
#
|
||||
|
||||
export MOZ_ENABLE_WAYLAND=1
|
||||
exec /usr/bin/firefox "$@"
|
||||
exec /__PREFIX__/bin/firefox "$@"
|
||||
|
||||
@ -4,4 +4,4 @@
|
||||
#
|
||||
|
||||
export MOZ_DISABLE_WAYLAND=1
|
||||
exec /usr/bin/firefox "$@"
|
||||
exec /__PREFIX__/bin/firefox "$@"
|
||||
|
||||
@ -17,10 +17,10 @@
|
||||
# Copyright (C) 1998 Netscape Communications Corporation. All
|
||||
# Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Contributor(s):
|
||||
#
|
||||
|
||||
##
|
||||
##
|
||||
## Usage:
|
||||
##
|
||||
## $ firefox
|
||||
@ -39,12 +39,12 @@ cmdname=`basename $0`
|
||||
MOZ_ARCH=$(uname -m)
|
||||
case $MOZ_ARCH in
|
||||
x86_64 | s390x | sparc64)
|
||||
MOZ_LIB_DIR="/usr/lib64"
|
||||
SECONDARY_LIB_DIR="/usr/lib"
|
||||
MOZ_LIB_DIR="/__PREFIX__/lib64"
|
||||
SECONDARY_LIB_DIR="/__PREFIX__/lib"
|
||||
;;
|
||||
* )
|
||||
MOZ_LIB_DIR="/usr/lib"
|
||||
SECONDARY_LIB_DIR="/usr/lib64"
|
||||
MOZ_LIB_DIR="/__PREFIX__/lib"
|
||||
SECONDARY_LIB_DIR="/__PREFIX__/lib64"
|
||||
;;
|
||||
esac
|
||||
|
||||
@ -79,7 +79,7 @@ fi
|
||||
## Set MOZ_GRE_CONF
|
||||
##
|
||||
MOZ_GRE_CONF=/etc/gre.d/gre.conf
|
||||
if [ "$MOZ_LIB_DIR" == "/usr/lib64" ]; then
|
||||
if [ "$MOZ_LIB_DIR" == "/__PREFIX__/lib64" ]; then
|
||||
MOZ_GRE_CONF=/etc/gre.d/gre64.conf
|
||||
fi
|
||||
export MOZ_GRE_CONF
|
||||
@ -107,7 +107,7 @@ export MOZ_PLUGIN_PATH
|
||||
##
|
||||
## Set MOZ_APP_LAUNCHER for gnome-session
|
||||
##
|
||||
export MOZ_APP_LAUNCHER="/usr/bin/firefox"
|
||||
export MOZ_APP_LAUNCHER="/__PREFIX__/bin/firefox"
|
||||
|
||||
##
|
||||
## Set FONTCONFIG_PATH for Xft/fontconfig
|
||||
@ -116,9 +116,9 @@ FONTCONFIG_PATH="/etc/fonts:${MOZILLA_FIVE_HOME}/res/Xft"
|
||||
export FONTCONFIG_PATH
|
||||
|
||||
##
|
||||
## In order to better support certain scripts (such as Indic and some CJK
|
||||
## scripts), Fedora builds its Firefox, with permission from the Mozilla
|
||||
## Corporation, with the Pango system as its text renderer. This change
|
||||
## In order to better support certain scripts (such as Indic and some CJK
|
||||
## scripts), Fedora builds its Firefox, with permission from the Mozilla
|
||||
## Corporation, with the Pango system as its text renderer. This change
|
||||
## may negatively impact performance on some pages. To disable the use of
|
||||
## Pango, set MOZ_DISABLE_PANGO=1 in your environment before launching
|
||||
## Firefox.
|
||||
@ -167,12 +167,12 @@ MOZILLA_DOWN=0
|
||||
if ! [ $MOZ_DISABLE_LANGPACKS ] || [ $MOZ_DISABLE_LANGPACKS -eq 0 ]; then
|
||||
if [ -x $MOZ_DIST_BIN/$MOZ_FIREFOX_FILE ]; then
|
||||
# Is firefox running?
|
||||
/usr/bin/pidof firefox > /dev/null 2>&1
|
||||
/__PREFIX__/bin/pidof firefox > /dev/null 2>&1
|
||||
MOZILLA_DOWN=$?
|
||||
fi
|
||||
fi
|
||||
|
||||
# Modify language pack configuration only when firefox is not running
|
||||
# Modify language pack configuration only when firefox is not running
|
||||
# and language packs are not disabled
|
||||
if [ $MOZILLA_DOWN -ne 0 ]; then
|
||||
|
||||
@ -199,7 +199,7 @@ if [ $MOZILLA_DOWN -ne 0 ]; then
|
||||
local langpack=langpack-${language}@firefox.mozilla.org.xpi
|
||||
if [ -f $MOZ_LANGPACKS_DIR/$langpack ]; then
|
||||
rm -rf $MOZ_EXTENSIONS_PROFILE_DIR/$langpack
|
||||
# If the target file is a symlink (the fallback langpack),
|
||||
# If the target file is a symlink (the fallback langpack),
|
||||
# install the original file instead of the fallback one
|
||||
if [ -h $MOZ_LANGPACKS_DIR/$langpack ]; then
|
||||
langpack=`readlink $MOZ_LANGPACKS_DIR/$langpack`
|
||||
|
||||
22
firefox.spec
22
firefox.spec
@ -1,7 +1,7 @@
|
||||
# Set to true if it's going to be submitted as update.
|
||||
%global release_build 1
|
||||
%global release_build 0
|
||||
# Special config to build as module
|
||||
%global module_build 0
|
||||
%global module_build 1
|
||||
|
||||
# Disabled arm due to rhbz#1658940
|
||||
ExcludeArch: armv7hl
|
||||
@ -97,7 +97,7 @@ ExcludeArch: s390x
|
||||
Summary: Mozilla Firefox Web browser
|
||||
Name: firefox
|
||||
Version: 66.0
|
||||
Release: 9%{?pre_tag}%{?dist}
|
||||
Release: 10%{?pre_tag}%{?dist}
|
||||
URL: https://www.mozilla.org/firefox/
|
||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
|
||||
@ -597,8 +597,8 @@ make -C objdir buildsymbols
|
||||
|
||||
%if %{?run_tests}
|
||||
%if %{?system_nss}
|
||||
ln -s /usr/bin/certutil objdir/dist/bin/certutil
|
||||
ln -s /usr/bin/pk12util objdir/dist/bin/pk12util
|
||||
ln -s %{_prefix}/bin/certutil objdir/dist/bin/certutil
|
||||
ln -s %{_prefix}/bin/pk12util objdir/dist/bin/pk12util
|
||||
|
||||
%endif
|
||||
mkdir test_results
|
||||
@ -657,14 +657,15 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE29}
|
||||
%global wayland_default false
|
||||
%endif
|
||||
%{__rm} -rf %{buildroot}%{_bindir}/firefox
|
||||
%{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' %{SOURCE21} > %{buildroot}%{_bindir}/firefox
|
||||
%{__sed} -e 's/__DEFAULT_WAYLAND__/%{wayland_default}/' \
|
||||
-e 's,__PREFIX__,%{_prefix},g' %{SOURCE21} > %{buildroot}%{_bindir}/firefox
|
||||
%{__chmod} 755 %{buildroot}%{_bindir}/firefox
|
||||
|
||||
%if 0%{?wayland_backend_default}
|
||||
%{__cat} %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11
|
||||
%{__sed} -e 's,__PREFIX__,%{_prefix},g' %{SOURCE30} > %{buildroot}%{_bindir}/firefox-x11
|
||||
%{__chmod} 755 %{buildroot}%{_bindir}/firefox-x11
|
||||
%else
|
||||
%{__cat} %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland
|
||||
%{__sed} -e 's,__PREFIX__,%{_prefix},g' %{SOURCE28} > %{buildroot}%{_bindir}/firefox-wayland
|
||||
%{__chmod} 755 %{buildroot}%{_bindir}/firefox-wayland
|
||||
%endif
|
||||
|
||||
@ -927,6 +928,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
#---------------------------------------------------------------------
|
||||
|
||||
%changelog
|
||||
* Thu Mar 21 2019 Martin Stransky <stransky@redhat.com> - 66.0-10.test
|
||||
- Test build
|
||||
|
||||
* Thu Mar 21 2019 Martin Stransky <stransky@redhat.com> - 66.0-9
|
||||
- Release build
|
||||
|
||||
@ -985,7 +989,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
||||
- Re-enable PipeWire support
|
||||
|
||||
* Mon Jan 28 2019 Martin Stransky <stransky@redhat.com> - 65.0-1
|
||||
- Update to 65.0 build 2
|
||||
- Update to 65.0 build 2
|
||||
|
||||
* Wed Jan 16 2019 Martin Stransky <stransky@redhat.com> - 64.0.2-2
|
||||
- Rebuild
|
||||
|
||||
Loading…
Reference in New Issue
Block a user