diff --git a/.firefox.metadata b/.firefox.metadata
index 4176fd9..96be813 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,8 +1,8 @@
18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz
ee55acedef049268307633cbc9c7ff0610d1244f SOURCES/Python-3.6.8.tar.xz
a4850bfd09fbdf8c64f4dc50a4b64422a2fcc023 SOURCES/cbindgen-vendor.tar.xz
-445acbf7b7b8f75374ee6347bb6f45748511bcf9 SOURCES/firefox-68.11.0esr.source.tar.xz
-425bf42e4329440cbfc70c9e698cbacfcd66a89c SOURCES/firefox-langpacks-68.11.0esr-20200723.tar.xz
+976fae5c3cdee8b7929e4f17eca6cf44513d08b4 SOURCES/firefox-68.12.0esr.source.tar.xz
+bac006a6f4785f01c09dfed17c495007110f8269 SOURCES/firefox-langpacks-68.12.0esr-20200820.tar.xz
0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm
4f8d3bf2483d95261ff90742ecec82d6a899eca3 SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm
diff --git a/.gitignore b/.gitignore
index 751197f..d245eff 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,8 @@
SOURCES/Python-2.7.13.tar.xz
SOURCES/Python-3.6.8.tar.xz
SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-68.11.0esr.source.tar.xz
-SOURCES/firefox-langpacks-68.11.0esr-20200723.tar.xz
+SOURCES/firefox-68.12.0esr.source.tar.xz
+SOURCES/firefox-langpacks-68.12.0esr-20200820.tar.xz
SOURCES/gtk3-private-3.22.26-1.el6.src.rpm
SOURCES/libffi-3.0.13-18.el7_3.src.rpm
SOURCES/nodejs-8.11.4-1.3.fc27.src.rpm
diff --git a/README.debrand b/README.debrand
deleted file mode 100644
index 01c46d2..0000000
--- a/README.debrand
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: This package was configured for automatic debranding, but the changes
-failed to apply.
diff --git a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch b/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
deleted file mode 100644
index 6dfe2ad..0000000
--- a/SOURCES/Bug-1238661---fix-mozillaSignalTrampoline-to-work-.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 firefox-60.0/mfbt/LinuxSignal.h
---- firefox-60.0/mfbt/LinuxSignal.h.mozilla-1238661 2018-04-27 08:55:38.848241768 +0200
-+++ firefox-60.0/mfbt/LinuxSignal.h 2018-04-27 09:06:47.946769859 +0200
-@@ -22,7 +22,7 @@ __attribute__((naked)) void SignalTrampo
- void* aContext) {
- asm volatile("nop; nop; nop; nop" : : : "memory");
-
-- asm volatile("b %0" : : "X"(H) : "memory");
-+ asm volatile("bx %0" : : "r"(H), "l"(aSignal), "l"(aInfo), "l"(aContext) : "memory");
- }
-
- # define MOZ_SIGNAL_TRAMPOLINE(h) (mozilla::SignalTrampoline<h>)
diff --git a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch b/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
deleted file mode 100644
index 3f84f95..0000000
--- a/SOURCES/Bug-1526653---fix_user_vfp_armv7.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From fd6847c9416f9eebde636e21d794d25d1be8791d Mon Sep 17 00:00:00 2001
-From: Mike Hommey <mh@glandium.org>
-Date: Sat, 1 Jun 2019 09:06:01 +0900
-Subject: [PATCH] Bug 1526653 - Include struct definitions for user_vfp and
- user_vfp_exc.
-
----
- js/src/wasm/WasmSignalHandlers.cpp | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/js/src/wasm/WasmSignalHandlers.cpp b/js/src/wasm/WasmSignalHandlers.cpp
-index 636537f8478..383c380f04c 100644
---- a/js/src/wasm/WasmSignalHandlers.cpp
-+++ b/js/src/wasm/WasmSignalHandlers.cpp
-@@ -248,7 +248,16 @@ using mozilla::DebugOnly;
- #endif
-
- #ifdef WASM_EMULATE_ARM_UNALIGNED_FP_ACCESS
--# include <sys/user.h>
-+struct user_vfp {
-+ unsigned long long fpregs[32];
-+ unsigned long fpscr;
-+};
-+
-+struct user_vfp_exc {
-+ unsigned long fpexc;
-+ unsigned long fpinst;
-+ unsigned long fpinst2;
-+};
- #endif
-
- #if defined(ANDROID)
---
-2.20.1
-
diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js
deleted file mode 100644
index ea10021..0000000
--- a/SOURCES/firefox-centos-default-prefs.js
+++ /dev/null
@@ -1,35 +0,0 @@
-pref("app.update.auto", false);
-pref("app.update.enabled", false);
-pref("app.update.autoInstallEnabled", false);
-pref("general.smoothScroll", true);
-pref("intl.locale.matchOS", true);
-pref("toolkit.storage.synchronous", 0);
-pref("toolkit.networkmanager.disable", false);
-pref("offline.autoDetect", true);
-pref("browser.backspace_action", 2);
-pref("browser.display.use_system_colors", true);
-pref("browser.download.folderList", 1);
-pref("browser.link.open_external", 3);
-pref("browser.shell.checkDefaultBrowser", false);
-pref("network.manage-offline-status", true);
-pref("extensions.shownSelectionUI", true);
-pref("ui.SpellCheckerUnderlineStyle", 1);
-pref("startup.homepage_override_url", "http://www.centos.org");
-pref("startup.homepage_welcome_url", "http://www.centos.org");
-pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/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);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("media.gmp-gmpopenh264.enabled",false);
-pref("plugins.notifyMissingFlash", false);
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1226489 */
-pref("browser.display.use_system_colors", false);
-pref("layers.use-image-offscreen-surfaces", false);
-/* Allow sending credetials to all https:// sites */
-pref("network.negotiate-auth.trusted-uris", "https://");
-pref("security.use_sqldb", false);
-/* Use OS settings for UI language */
-pref("intl.locale.requested", "");
-/* See https://bugzilla.redhat.com/show_bug.cgi?id=1672424 */
-pref("storage.nfs_filesystem", true);
diff --git a/SOURCES/no-rust-lto.patch b/SOURCES/no-rust-lto.patch
deleted file mode 100644
index 7d8ae5d..0000000
--- a/SOURCES/no-rust-lto.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-68.0/config/makefiles/rust.mk.old firefox-68.0/config/makefiles/rust.mk
---- firefox-68.0/config/makefiles/rust.mk.old 2019-06-05 10:33:34.290128660 +0200
-+++ firefox-68.0/config/makefiles/rust.mk 2019-06-05 10:33:59.835052814 +0200
-@@ -47,7 +47,7 @@ cargo_rustc_flags = $(CARGO_RUSTCFLAGS)
- ifndef DEVELOPER_OPTIONS
- ifndef MOZ_DEBUG_RUST
- # Enable link-time optimization for release builds.
--cargo_rustc_flags += -C lto
-+#cargo_rustc_flags += -C lto
- endif
- endif
-
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 54a2abf..b04fe6e 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -185,7 +185,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 68.11.0
+Version: 68.12.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -198,7 +198,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}-20200723.tar.xz
+Source1: firefox-langpacks-%{version}%{?pre_version}-20200820.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source10: firefox-mozconfig
@@ -242,7 +242,6 @@ Patch1002: python-2.7-gcc8-fix.patch
Patch1003: python-missing-utimensat.patch
Patch1004: build-icu-make.patch
# workaround for https://bugzilla.redhat.com/show_bug.cgi?id=1699374
-Patch1: no-rust-lto.patch
Patch2: rust-network-check.patch
Patch4: build-mozconfig-fix.patch
Patch6: build-nss-version.patch
@@ -520,7 +519,6 @@ https://extensions.gnome.org.
# Build patches, can't change backup suffix from default because during build
# there is a compare of config and js/config directories and .orig suffix is
# ignored during this compare.
-%patch1 -p1 -b .no-rust-lto
%patch2 -p1 -b .rust-network-check
%patch7 -p1 -b .debugedits-error
%ifarch %{ix86} %{arm} ppc
@@ -555,7 +553,6 @@ https://extensions.gnome.org.
%endif
%patch234 -p1 -b .rhbz-1821418
-
#ARM run-time patch
#%ifarch aarch64
#%patch226 -p1 -b .1354671
@@ -966,9 +963,12 @@ export MOZ_DEBUG_FLAGS=" "
%ifarch s390 %{arm} ppc aarch64 i686
MOZ_LINK_FLAGS="-Wl,--no-keep-memory -Wl,--reduce-memory-overheads"
%endif
-%ifarch %{arm}
+%ifarch %{arm} %{ix86}
export RUSTFLAGS="-Cdebuginfo=0"
%endif
+%ifarch %{ix86}
+export PROFILE=release
+%endif
export CFLAGS=$MOZ_OPT_FLAGS
export CXXFLAGS=$MOZ_OPT_FLAGS
export LDFLAGS=$MOZ_LINK_FLAGS
@@ -989,8 +989,8 @@ MOZ_SMP_FLAGS=-j1
[ -z "$RPM_BUILD_NCPUS" ] && \
RPM_BUILD_NCPUS="`/usr/bin/getconf _NPROCESSORS_ONLN`"
[ "$RPM_BUILD_NCPUS" -ge 2 ] && MOZ_SMP_FLAGS=-j2
-[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j4
-[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j8
+[ "$RPM_BUILD_NCPUS" -ge 4 ] && MOZ_SMP_FLAGS=-j2
+[ "$RPM_BUILD_NCPUS" -ge 8 ] && MOZ_SMP_FLAGS=-j2
%endif
%endif
@@ -1390,6 +1390,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Thu Aug 20 2020 Jan Horak <jhorak@redhat.com>
+- Update to 68.12.0 build1
+
* Thu Jul 23 2020 Jan Horak <jhorak@redhat.com>
- Update to 68.11.0 build1