Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2021-12-23 13:32:16 +03:00
commit 075a817284
3 changed files with 13 additions and 10 deletions

View File

@ -1,5 +1,5 @@
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
736b0b4313f678de624c0124f61a86893385d110 SOURCES/firefox-91.3.0esr.processed-source.tar.xz 322e0ffb8b442f599b0f5dd695e6f83050b3dc82 SOURCES/firefox-91.4.0esr.processed-source.tar.xz
7b821f5b94cba12efc8a2b86dbd8c7321b453568 SOURCES/firefox-langpacks-91.3.0esr-20211101.tar.xz 74a1b8c9a5f4a96f80af2d3fe542495e3af2423a SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
29da2158892dc108a7a21fd8411fccf0061481b3 SOURCES/nss-3.67.0-6.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm

6
.gitignore vendored
View File

@ -1,5 +1,5 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-91.3.0esr.processed-source.tar.xz SOURCES/firefox-91.4.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-91.3.0esr-20211101.tar.xz SOURCES/firefox-langpacks-91.4.0esr-20211201.tar.xz
SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nspr-4.32.0-1.el8_1.src.rpm
SOURCES/nss-3.67.0-6.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm

View File

@ -130,7 +130,7 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 91.3.0 Version: 91.4.0
Release: 1%{?dist} Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -151,7 +151,7 @@ ExcludeArch: s390 ppc
# Link to official tarball: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%%{version}%%{?pre_version}.source.tar.xz # 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}.processed-source.tar.xz
%if %{build_langpacks} %if %{build_langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20211101.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20211201.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -166,7 +166,7 @@ Source26: distribution.ini
Source27: google-api-key Source27: google-api-key
Source28: node-stdout-nonblocking-wrapper Source28: node-stdout-nonblocking-wrapper
Source403: nss-3.67.0-6.el8_1.src.rpm Source403: nss-3.67.0-7.el8_1.src.rpm
Source401: nss-setup-flags-env.inc Source401: nss-setup-flags-env.inc
Source402: nspr-4.32.0-1.el8_1.src.rpm Source402: nspr-4.32.0-1.el8_1.src.rpm
@ -1103,7 +1103,7 @@ sed -i -e 's|%PREFIX%|%{_prefix}|' %{buildroot}%{mozappdir}/defaults/preferences
echo 'pref("security.pki.use_modern_crypto_with_pkcs12", true);' >> %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js echo 'pref("security.pki.use_modern_crypto_with_pkcs12", true);' >> %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js
%endif %endif
%ifarch s390x %ifarch s390x ppc64
echo 'pref("gfx.webrender.force-disabled", true);' >> %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js echo 'pref("gfx.webrender.force-disabled", true);' >> %{buildroot}%{mozappdir}/defaults/preferences/all-redhat.js
%endif %endif
@ -1245,6 +1245,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Wed Dec 01 2021 Eike Rathke <erack@redhat.com> - 91.4.0-1
- Update to 91.4.0 build1
* Mon Nov 01 2021 Eike Rathke <erack@redhat.com> - 91.3.0-1 * Mon Nov 01 2021 Eike Rathke <erack@redhat.com> - 91.3.0-1
- Update to 91.3.0 build1 - Update to 91.3.0 build1