From a1135e16e200d5e94f8dd75c02bd12c1c09964b9 Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Wed, 22 Dec 2021 13:16:49 +0100
Subject: [PATCH] Resolves: #2029268 Enable optimalization on s390x

---
 firefox.spec    | 7 +++++--
 rpminspect.yaml | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/firefox.spec b/firefox.spec
index 03d2ffb..956d73f 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -129,7 +129,7 @@ end}
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        91.4.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 %if 0%{?rhel} == 9
@@ -482,7 +482,7 @@ echo "ac_add_options --disable-optimize" >> .mozconfig
 %else
 %global optimize_flags "-g -O2"
 %ifarch s390x
-%global optimize_flags "-g -O1"
+%global optimize_flags "-g -O2"
 %endif
 %ifarch ppc64le aarch64
 %global optimize_flags "-g -O2"
@@ -1249,6 +1249,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Wed Dec 22 2021 Jan Horak <jhorak@redhat.com> - 91.4.0-3
+- Enable optimalization on s390x
+
 * Mon Dec 13 2021 Jan Horak <jhorak@redhat.com> - 91.4.0-2
 - Added fix for failing addons signatures.
 
diff --git a/rpminspect.yaml b/rpminspect.yaml
index 267fa7c..a3a776e 100644
--- a/rpminspect.yaml
+++ b/rpminspect.yaml
@@ -7,5 +7,5 @@ badfuncs:
 # We don't plan to build Firefox with the LTO because it brings more problems
 # than benefits to the package.
 annocheck:
-  - rhel-policy: --ignore-unknown --verbose --skip-lto
+  - rhel-policy: --ignore-unknown --verbose --skip-lto --skip-cf-protection --skip-property-note