Merge branch 'master' into f31

2019-12-09 19:06:05 +01:00 · 2019-12-09 19:06:05 +01:00 · cb7dfd887c
commit cb7dfd887c
parent 2c7788b91d b7c36a753b
1 changed files with 6 additions and 2 deletions
--- a/firefox.spec
+++ b/firefox.spec
@ -9,6 +9,12 @@ ExcludeArch: armv7hl
 # Disabled due to https://pagure.io/fedora-infrastructure/issue/7581
 ExcludeArch: s390x

+%ifarch x86_64 %{ix86}
+%global enable_mozilla_crashreporter 1
+%else
+%global enable_mozilla_crashreporter 0
+%endif
+
 %global system_nss        1
 %global system_ffi        1
 %global system_libvpx     0
@ -76,8 +82,6 @@ ExcludeArch: s390x

 %bcond_without langpacks

-%global enable_mozilla_crashreporter 1
-
 %if !%{release_build}
 %global pre_tag .npgo
 %endif