Merge remote-tracking branch 'alma-origin/c8' into HEAD
This commit is contained in:
commit
748ab73828
@ -1,5 +1,5 @@
|
|||||||
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
|
c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz
|
||||||
a42cb494b90ea92c186e1912c8c5f64bad365633 SOURCES/firefox-91.8.0esr.processed-source.tar.xz
|
0d960c32727bbe7dd0b752a3d2165f429f4144b3 SOURCES/firefox-91.9.0esr.processed-source.tar.xz
|
||||||
0ec5e6f571ac5aa2ac4cefc5a18ddecf01395dde SOURCES/firefox-langpacks-91.8.0esr-20220405.tar.xz
|
584306ac938eedb9e3ad93e5d23481b63478bbaf SOURCES/firefox-langpacks-91.9.0esr-20220426.tar.xz
|
||||||
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
|
b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm
|
||||||
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
|
8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm
|
||||||
|
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,5 +1,5 @@
|
|||||||
SOURCES/cbindgen-vendor.tar.xz
|
SOURCES/cbindgen-vendor.tar.xz
|
||||||
SOURCES/firefox-91.8.0esr.processed-source.tar.xz
|
SOURCES/firefox-91.9.0esr.processed-source.tar.xz
|
||||||
SOURCES/firefox-langpacks-91.8.0esr-20220405.tar.xz
|
SOURCES/firefox-langpacks-91.9.0esr-20220426.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-7.el8_1.src.rpm
|
SOURCES/nss-3.67.0-7.el8_1.src.rpm
|
||||||
|
@ -18,7 +18,7 @@ function dist_to_rhel_minor(str, start)
|
|||||||
end
|
end
|
||||||
match = string.match(str, ".el8")
|
match = string.match(str, ".el8")
|
||||||
if match then
|
if match then
|
||||||
return 6
|
return 7
|
||||||
end
|
end
|
||||||
return -1
|
return -1
|
||||||
end}
|
end}
|
||||||
@ -130,7 +130,7 @@ end}
|
|||||||
|
|
||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 91.8.0
|
Version: 91.9.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+
|
||||||
@ -155,7 +155,7 @@ ExcludeArch: aarch64 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}-20220405.tar.xz
|
Source1: firefox-langpacks-%{version}%{?pre_version}-20220426.tar.xz
|
||||||
|
|
||||||
%endif
|
%endif
|
||||||
Source2: cbindgen-vendor.tar.xz
|
Source2: cbindgen-vendor.tar.xz
|
||||||
@ -433,7 +433,7 @@ echo "use_rustts %{?use_rustts}"
|
|||||||
%patch224 -p1 -b .1170092
|
%patch224 -p1 -b .1170092
|
||||||
|
|
||||||
# the nss changed in 8.6 and later, so addons are working in older releases
|
# the nss changed in 8.6 and later, so addons are working in older releases
|
||||||
%if 0%{?rhel_minor_version} >= 6
|
%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 6) || 0%{?rhel} >= 9
|
||||||
%patch225 -p1 -b .firefox-nss-addon-hack
|
%patch225 -p1 -b .firefox-nss-addon-hack
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
@ -1262,6 +1262,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Apr 26 2022 Eike Rathke <erack@redhat.com> - 91.9.0-1
|
||||||
|
- Update to 91.9.0
|
||||||
|
|
||||||
* Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
|
* Tue Apr 05 2022 Eike Rathke <erack@redhat.com> - 91.8.0-1
|
||||||
- Update to 91.8.0
|
- Update to 91.8.0
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user