From 7e5bd536c14e3426d4252f04efb858e8d04cd744 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@redhat.com>
Date: Mon, 9 Mar 2020 12:10:02 +0100
Subject: Update to 74.0 Build 2

---
 .gitignore   |  1 +
 firefox.spec | 20 +++++++-------------
 sources      |  4 ++--
 3 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/.gitignore b/.gitignore
index fa4ed24..578d1ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -387,3 +387,4 @@ firefox-3.6.4.source.tar.bz2
 /firefox-langpacks-73.0.1-20200220.tar.xz
 /firefox-74.0.source.tar.xz
 /firefox-langpacks-74.0-20200303.tar.xz
+/firefox-langpacks-74.0-20200309.tar.xz
diff --git a/firefox.spec b/firefox.spec
index 6517a5e..d2c056e 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -5,7 +5,7 @@
 %global build_with_asan   0
 
 # Disabled arm due to rhbz#1658940
-ExcludeArch: armv7hl
+# ExcludeArch: armv7hl
 # Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
 ExcludeArch: s390x
 # Disabled due to neon build error
@@ -22,7 +22,7 @@ ExcludeArch: s390x
 %global enable_mozilla_crashreporter 0
 %endif
 
-%global system_nss        0
+%global system_nss        1
 %global system_ffi        1
 %ifarch armv7hl
 %global system_libvpx     1
@@ -116,12 +116,12 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        74.0
-Release:        1%{?nss_tag}%{?dist}
+Release:        2%{?nss_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
 %if %{with langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20200303.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20200309.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source10:       firefox-mozconfig
@@ -428,12 +428,6 @@ echo "ac_add_options --enable-debug" >> .mozconfig
 echo "ac_add_options --disable-optimize" >> .mozconfig
 %else
 %global optimize_flags "none"
-%ifarch armv7hl
-# ARMv7 needs that (rhbz#1426850)
-%global optimize_flags "-g -O2 -fno-schedule-insns"
-# Disable libaom due to rhbz#1641623
-#echo "ac_add_options --disable-av1" >> .mozconfig
-%endif
 %ifarch ppc64le aarch64
 %global optimize_flags "-g -O2"
 %endif
@@ -545,9 +539,6 @@ MOZ_OPT_FLAGS=$(echo "$MOZ_OPT_FLAGS" | %{__sed} -e 's/-Werror=format-security//
 %endif
 %if 0%{?fedora} > 30
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fpermissive"
-%ifarch armv7hl
-MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -flax-vector-conversions"
-%endif
 %endif
 %if %{?hardened_build}
 MOZ_OPT_FLAGS="$MOZ_OPT_FLAGS -fPIC -Wl,-z,relro -Wl,-z,now"
@@ -964,6 +955,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Mar 09 2020 Martin Stransky <stransky@redhat.com> - 74.0-2
+- Update to 74.0 Build 2
+
 * Tue Mar 03 2020 Martin Stransky <stransky@redhat.com> - 74.0-1
 - Update to 74.0 Build 1
 - Added mozbz#1609538
diff --git a/sources b/sources
index 738d572..ab22ed2 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (firefox-74.0.source.tar.xz) = 83fcdf1a8a702cc480314dbbef0a819f95fac2ebbe275207b052ba8d62bfa9d93dc21b25ebfc466e798933e3f7b9a3bd9afc6afc295451495bb3d8a2bf864f44
-SHA512 (firefox-langpacks-74.0-20200303.tar.xz) = 3cdb50c27adaaa85d727f2a8c0c6a284092fa4af815fdfbc8d170066287b22b566d052cc8e151ed901bcebf1a5ae2f19bb68be543738d35eac4a316aadb78232
 SHA512 (cbindgen-vendor.tar.xz) = a12d9dd45301614f3a7fcd77f61e3f731718fc418fcf84b0ac7363ef4ddd8ff60e057febef917620ac89d2d47d76b8dccfa71405935e346b849b93425732016a
+SHA512 (firefox-langpacks-74.0-20200309.tar.xz) = 50e510a78a01a6514157dfa56e5e6842b9cb22fcbb24ca89ff43c891b7d24a697386ddbe6dd8aa882b851ccdac68ebd09b08faa9f1a526d0129b8f48e2a92457
+SHA512 (firefox-74.0.source.tar.xz) = 68a4ad5408e953a881bd84d2c69bc41e0ce819750d0f74b4ee1c5a9be73a4523e7d1bcb0a44c74883387bca1b347b321e751e6159e0f1e2e08ae0bbf85568730
-- 
cgit