Merge remote-tracking branch 'alma-origin/c8' into HEAD

.firefox.metadata

@@ -1,5 +1,5 @@
 c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
-0d960c32727bbe7dd0b752a3d2165f429f4144b3 SOURCES/firefox-91.9.0esr.processed-source.tar.xz
+d13ae0300c2295a2762eeeea2556ca847e55799c SOURCES/firefox-91.9.1esr.processed-source.tar.xz
-584306ac938eedb9e3ad93e5d23481b63478bbaf SOURCES/firefox-langpacks-91.9.0esr-20220426.tar.xz
+253fb25c2ea809ca7505c4b164723038f2a5e718 SOURCES/firefox-langpacks-91.9.1esr-20220520.tar.xz
 b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm

.gitignore

@@ -1,5 +1,5 @@
 SOURCES/cbindgen-vendor.tar.xz
-SOURCES/firefox-91.9.0esr.processed-source.tar.xz
+SOURCES/firefox-91.9.1esr.processed-source.tar.xz
-SOURCES/firefox-langpacks-91.9.0esr-20220426.tar.xz
+SOURCES/firefox-langpacks-91.9.1esr-20220520.tar.xz
 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
 SOURCES/nss-3.67.0-7.el8_1.src.rpm

SPECS/firefox.spec

@@ -128,9 +128,16 @@ end}
 %global official_branding       1
 %global build_langpacks         1
 
+# Workaround the dreaded "upstream source file changed content" rpmdiff failure that only secalert can waive.
+# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
+# firefox-91.9.0esr.b2.processed-source.tar.xz
+# With does_not_exist it's empty and source file name as is.
+#global buildnum %{?does_not_exist}
+%global buildnum %{?does_not_exist}
+
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        91.9.0
+Version:        91.9.1
 Release:        1%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -153,9 +160,9 @@ ExcludeArch:    aarch64 s390 ppc
 # The official tarball has to be always processed by the process-official-tarball
 # script.
 # 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
+Source0:        firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20220426.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20220520.tar.xz
 
 %endif
 Source2:        cbindgen-vendor.tar.xz
@@ -432,8 +439,8 @@ echo "use_rustts            %{?use_rustts}"
 %patch219 -p1 -b .rhbz-1173156
 %patch224 -p1 -b .1170092
 
-# the nss changed in 8.6 and later, so addons are working in older releases
+# Enable workaround for RHEL >= 8: rhbz#2043303
-%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 6) || 0%{?rhel} >= 9
+%if 0%{?rhel} == 8 || 0%{?rhel} >= 9
 %patch225 -p1 -b .firefox-nss-addon-hack
 %endif
 
@@ -1262,6 +1269,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri May 20 2022 Jan Horak <jhorak@redhat.com> - 91.9.1-1
+- Update to 91.9.1 build1
+
 * Tue Apr 26 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
 - Update to 91.9.0