diff --git a/.firefox.metadata b/.firefox.metadata
index 692c2d9..adddfa8 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,7 +1,7 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
a9effcc06cf80eaa22f12c1f7d6aa4266a1c4966 SOURCES/cbindgen-vendor-0.14.3.tar.xz
-4dc4e41ae749e1d189ac8f45d0b804a18b8d38c3 SOURCES/firefox-78.6.0esr.source.tar.xz
-d45296cbd3128ebc9aaf3f91a8b1d4cd6051365a SOURCES/firefox-langpacks-78.6.0esr-20201210.tar.xz
+79b6254bfcbb3c257ffed71b4abbf2c7107725fb SOURCES/firefox-78.7.1esr.source.tar.xz
+bf1cd174d728653d13e27f293afc2092bfc7f8d4 SOURCES/firefox-langpacks-78.7.1esr-20210209.tar.xz
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
5715f987bc0024ce5d72993cb101b8268350033b SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/.gitignore b/.gitignore
index 297d297..324011c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
SOURCES/Python-2.7.13.tar.xz
SOURCES/cbindgen-vendor-0.14.3.tar.xz
-SOURCES/firefox-78.6.0esr.source.tar.xz
-SOURCES/firefox-langpacks-78.6.0esr-20201210.tar.xz
+SOURCES/firefox-78.7.1esr.source.tar.xz
+SOURCES/firefox-langpacks-78.7.1esr-20210209.tar.xz
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
SOURCES/nodejs-10.21.0-5.fc32.src.rpm
diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js
index 607a132..9ead3a2 100644
--- a/SOURCES/firefox-redhat-default-prefs.js
+++ b/SOURCES/firefox-redhat-default-prefs.js
@@ -16,7 +16,7 @@ pref("extensions.shownSelectionUI", true);
pref("ui.SpellCheckerUnderlineStyle", 1);
pref("startup.homepage_override_url", "http://www.redhat.com");
pref("startup.homepage_welcome_url", "http://www.redhat.com");
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html");
+pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///%PREFIX%/share/doc/HTML/index.html");
pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
pref("media.gmp-gmpopenh264.provider.enabled",false);
pref("media.gmp-gmpopenh264.autoupdate",false);
diff --git a/SOURCES/firefox.sh.in b/SOURCES/firefox.sh.in
index 2c8ffc1..ecff558 100644
--- a/SOURCES/firefox.sh.in
+++ b/SOURCES/firefox.sh.in
@@ -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
@@ -98,7 +98,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
@@ -157,7 +157,7 @@ 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
+ pidof firefox > /dev/null 2>&1
MOZILLA_DOWN=$?
fi
fi
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index fa8653b..8d77d4b 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -131,7 +131,7 @@
#%global default_bookmarks_file %{_datadir}/bookmarks/default-bookmarks.html
# need to use full path because of flatpak where datadir is /app/share
-%global default_bookmarks_file /usr/share/bookmarks/default-bookmarks.html
+%global default_bookmarks_file %{_prefix}/share/bookmarks/default-bookmarks.html
%global firefox_app_id \{ec8030f7-c20a-464f-9b0e-13a3a9e97384\}
# Minimal required versions
%global cairo_version 1.13.1
@@ -215,7 +215,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 78.6.0
+Version: 78.7.1
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -228,7 +228,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x
Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?pre_version}-20201210.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20210209.tar.xz
%endif
Source2: cbindgen-vendor-0.14.3.tar.xz
Source10: firefox-mozconfig
@@ -1220,6 +1220,11 @@ fi
# Usually the compiler processes can take 2 GB of memory at peaks
TASK_SIZE=4000000
MEM_CONSTRAINED_JOBS=$(( MEM_AVAILABLE / TASK_SIZE ))
+
+if [ $MEM_CONSTRAINED_JOBS -le 0 ]; then
+ MEM_CONSTRAINED_JOBS=1
+fi
+
CPU_AVAILABLE=$(/usr/bin/getconf _NPROCESSORS_ONLN)
# Pick the minimum from available CPUs or memory constrained number of jobs
MOZ_SMP_FLAGS=-j$([ "$CPU_AVAILABLE" -le "$MEM_CONSTRAINED_JOBS" ] && echo "$CPU_AVAILABLE" || echo "$MEM_CONSTRAINED_JOBS")
@@ -1380,6 +1385,7 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20}
# set up the firefox start script
%{__rm} -rf %{buildroot}%{_bindir}/firefox
%{__cat} %{SOURCE21} > %{buildroot}%{_bindir}/firefox
+sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{_bindir}/firefox
%if 0%{?bundle_gtk3}
sed -i -e 's|%RHEL_ENV_VARS%|export XDG_DATA_DIRS="$MOZ_LIB_DIR/firefox/bundled/share:/usr/share:$XDG_DATA_DIRS"\nexport FONTCONFIG_FILE="$MOZ_LIB_DIR/firefox/bundled/etc/fonts/fonts.conf"|' %{buildroot}%{_bindir}/firefox
%else
@@ -1498,6 +1504,7 @@ create_default_langpack "zh-TW" "zh"
ln -s %{mozappdir}/defaults/preferences $RPM_BUILD_ROOT/%{mozappdir}/browser/defaults/preferences
# Default preferences
%{__cp} %{SOURCE12} %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js
+sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js
# System config dir
%{__mkdir_p} %{buildroot}/%{_sysconfdir}/%{name}/pref
@@ -1678,6 +1685,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Tue Feb 09 2021 Eike Rathke <erack@redhat.com> - 78.7.1-1
+- Update to 78.7.1
+
+* Tue Feb 09 2021 Jan Horak <jhorak@redhat.com> - 78.7.0-3
+- Fixing install prefix for the homepage
+
+* Fri Jan 22 2021 Eike Rathke <erack@redhat.com> - 78.7.0-2
+- Update to 78.7.0 build2
+
+* Wed Jan 20 2021 Eike Rathke <erack@redhat.com> - 78.7.0-1
+- Update to 78.7.0 build1
+
+* Wed Jan 6 2021 Eike Rathke <erack@redhat.com> - 78.6.1-1
+- Update to 78.6.1 build1
+
* Thu Dec 10 2020 Jan Horak <jhorak@redhat.com> - 78.6.0-1
- Update to 78.6.0 build1