From 74968fda5164571093a401117941be653faa2354 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mar 01 2022 10:46:39 +0000
Subject: import firefox-91.6.0-2.el9


---

diff --git a/.firefox.metadata b/.firefox.metadata
index 49d14a0..9cc981b 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,5 +1,5 @@
 c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
-7a15042e733a831ee519372eef5b50fdc0becdde SOURCES/firefox-91.5.0esr.processed-source.tar.xz
-4a72e79ba3d0861cad3e229ef54e66014f65447b SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz
+986181f538d2a6951f95b4e1a754854b8e0048ff SOURCES/firefox-91.6.0esr.processed-source.tar.xz
+ea7fce0f4ee0101b6d9ef8b4d050fe8a16becff9 SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz
 b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
diff --git a/.gitignore b/.gitignore
index 1c80fd7..6475423 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-91.5.0esr.processed-source.tar.xz
-SOURCES/firefox-langpacks-91.5.0esr-20220106.tar.xz
+SOURCES/firefox-91.6.0esr.processed-source.tar.xz
+SOURCES/firefox-langpacks-91.6.0esr-20220202.tar.xz
 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 SOURCES/nss-3.67.0-7.el8_1.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/firefox-mozconfig b/SOURCES/firefox-mozconfig
index 9e8a32f..6c7afd7 100644
--- a/SOURCES/firefox-mozconfig
+++ b/SOURCES/firefox-mozconfig
@@ -12,7 +12,6 @@ ac_add_options --enable-chrome-format=omni
 ac_add_options --enable-pulseaudio
 ac_add_options --without-system-icu
 ac_add_options --enable-release
-ac_add_options --update-channel=release
 ac_add_options --allow-addon-sideload
 ac_add_options --with-system-jpeg
 ac_add_options --enable-js-shell
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 32e0f10..36e613e 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -128,18 +128,22 @@ end}
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        91.5.0
-Release:        1%{?dist}
+Version:        91.6.0
+Release:        2%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 %if 0%{?rhel} == 9
 ExcludeArch:    %{ix86}
 %endif
 %if 0%{?rhel} == 8
+  %if %{rhel_minor_version} == 1
+ExcludeArch:    %{ix86} aarch64 s390x
+  %else
 ExcludeArch:    %{ix86}
+  %endif
 %endif
 %if 0%{?rhel} == 7
-ExcludeArch:    s390 ppc
+ExcludeArch:    aarch64 s390 ppc
 %endif
 
 # We can't use the official tarball as it contains some test files that use
@@ -149,7 +153,7 @@ ExcludeArch:    s390 ppc
 # Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz
 Source0:        firefox-%{version}%{?pre_version}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20220106.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20220202.tar.xz
 %endif
 Source2:        cbindgen-vendor.tar.xz
 Source3:        process-official-tarball
@@ -425,7 +429,15 @@ echo "use_rustts            %{?use_rustts}"
 %patch215 -p1 -b .addons
 %patch219 -p1 -b .rhbz-1173156
 %patch224 -p1 -b .1170092
+
+# the nss changed in 8.6 and later, so addons are working in older releases
+%if 0%{?rhel_minor_version} >= 6
+%patch225 -p1 -b .firefox-nss-addon-hack
+%endif
+
+%if 0%{?rhel} >= 9
 %patch225 -p1 -b .firefox-nss-addon-hack
+%endif
 
 # Patch for big endian platforms only
 %if 0%{?big_endian}
@@ -645,7 +657,7 @@ function build_bundled_package() {
   echo $PKG_CONFIG_PATH
 
   rpm -ivh %{SOURCE403}
-  rpmbuild --nodeps --define '_prefix %{bundled_install_path}' -ba %{_specdir}/nss.spec
+  rpmbuild --nodeps --define '_prefix %{bundled_install_path}' --without=tests -ba %{_specdir}/nss.spec
   pushd %{_buildrootdir}
   #cleanup
   #rm -rf {_buildrootdir}/usr/lib/debug/*
@@ -1249,8 +1261,15 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
-* Tue Feb 01 2022 CentOS Sources <bugs@centos.org> - 91.5.0-1.el9.centos
-- Apply debranding changes
+* Wed Feb 09 2022 Jan Horak <jhorak@redhat.com> - 91.6.0-2
+- Enable addon installation on rhel9
+
+* Wed Feb 02 2022 Eike Rathke <erack@redhat.com> - 91.6.0-1
+- Update to 91.6.0 build1
+
+* Wed Feb 02 2022 Jan Horak <jhorak@redhat.com> - 91.5.0-2
+- Use default update channel to fix non working enterprise policies:
+  rhbz#2044667
 
 * Thu Jan 06 2022 Eike Rathke <erack@redhat.com> - 91.5.0-1
 - Update to 91.5.0 build1