diff --git a/download b/download index 2b251a43f67a42936913d3f9ea086d7e3707224b..84ee633c8a0789498ad28848b1054f6667bad6f4 100644 --- a/download +++ b/download @@ -1,5 +1,5 @@ -9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz -a130eff8558c46cad9d5ad957ec16a7b firefox-91.7.0esr.processed-source.tar.xz -499f3d8cf3e7ca16a61bda6e49cbf4fc firefox-langpacks-91.7.0esr-20220307.tar.xz -5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm -770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm +9030c1f285ee079a4c386e525e57a2b1 cbindgen-vendor.tar.xz +a135ed443e0a90b552880362975feefa firefox-91.9.1esr.processed-source.tar.xz +e3c6397907f2e5bb1ac5948acf01495c firefox-langpacks-91.9.1esr-20220520.tar.xz +5b7e3326f4484ce1ab685e74f8477a26 nspr-4.32.0-1.el8_1.src.rpm +770fbbfb259e656b8f3879934137d10c nss-3.67.0-7.el8_1.src.rpm diff --git a/firefox.spec b/firefox.spec index 2c72eade09fc03004ec7552b9ed92be6382c4871..9ebe5d25dfbb59964fff33e14ddf2d014b00f687 100644 --- a/firefox.spec +++ b/firefox.spec @@ -19,7 +19,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".an8") if match then - return 6 + return 7 end return -1 end} @@ -127,10 +127,17 @@ 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.7.0 -Release: 3%{anolis_release}%{?dist} +Version: 91.9.1 +Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 9 @@ -152,9 +159,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}-20220307.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20220520.tar.xz %endif Source2: cbindgen-vendor.tar.xz @@ -430,8 +437,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 -%if 0%{?rhel_minor_version} >= 6 +# Enable workaround for RHEL >= 8: rhbz#2043303 +%if 0%{?rhel} == 8 || 0%{?rhel} >= 9 %patch225 -p1 -b .firefox-nss-addon-hack %endif @@ -1260,10 +1267,19 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Fri Mar 11 2022 Liwei Ge - 91.7.0-3.0.1 +* Sat May 28 2022 Liwei Ge - 91.9.1-1.0.1 - Add firefox-anolis-default-prefs.js - Remove bookmarks +* Fri May 20 2022 Jan Horak - 91.9.1-1 +- Update to 91.9.1 build1 + +* Tue Apr 26 2022 Eike Rathke - 91.9.0-1 +- Update to 91.9.0 + +* Tue Apr 05 2022 Eike Rathke - 91.8.0-1 +- Update to 91.8.0 + * Mon Mar 07 2022 Eike Rathke - 91.7.0-3 - Update to 91.7.0 build3