rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'c9' into a9

Browse Source
This commit is contained in:
eabdullin 2022-11-22 13:25:01 +00:00 committed by Stepan Oksanichenko
commit aa32cb61a8
4 changed files with 24 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.firefox.metadata
View File

@ -1,6 +1,6 @@
52f2d51d0e17d137571bf3a766f514d34e28e556 SOURCES/cbindgen-vendor.tar.xz
cd92cc1af9b71503bc3f495f80bd1731ba8c64b2 SOURCES/firefox-102.4.0esr.processed-source.tar.xz
22af4a12cac3c237e75c8bbe76b71103320f850c SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz
c0e4d44aee25bed036ad1f534bbd53a395f77f3c SOURCES/firefox-102.5.0esr.processed-source.tar.xz
cd8dfecbe2062065caf994fba339d87e95342068 SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz
da39a3ee5e6b4b0d3255bfef95601890afd80709 SOURCES/mochitest-python.tar.gz
af58b3c87a8b5491dde63b07efaeb3d7f1ec56c1 SOURCES/nspr-4.34.0-3.el8_1.src.rpm
fc5297c6830f0a1e88f84b94b0b066487664061b SOURCES/nss-3.79.0-6.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-102.4.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-102.4.0esr-20221012.tar.xz
SOURCES/firefox-102.5.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-102.5.0esr-20221109.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.34.0-3.el8_1.src.rpm
SOURCES/nss-3.79.0-6.el8_1.src.rpm

11
SOURCES/build-rhel7-lower-node-min-version.patch Normal file
View File

@ -0,0 +1,11 @@
--- firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2022-10-10 17:55:56.000000000 +0200
+++ firefox-102.4.0/python/mozbuild/mozbuild/nodeutil.py 2022-10-17 14:57:47.476182627 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
from mozfile import which
from six import PY3
-NODE_MIN_VERSION = StrictVersion("10.24.1")
+NODE_MIN_VERSION = StrictVersion("10.24.0")
NPM_MIN_VERSION = StrictVersion("6.14.12")

12
SPECS/firefox.spec
View File

@ -201,7 +201,7 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 102.4.0
Version: 102.5.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -226,7 +226,7 @@ ExcludeArch: aarch64 s390 ppc
# Link to original tarball: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
Source0: firefox-%{version}%{?pre_version}.processed-source.tar.xz
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20221012.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20221109.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@ -273,6 +273,7 @@ Patch73: build-ascii-decode-fail-rhel7.patch
Patch75: build-big-endian-errors.patch
Patch76: firefox-nss-version.patch
Patch77: mozilla-1775202.patch
Patch78: build-rhel7-lower-node-min-version.patch
# Test patches
@ -637,6 +638,9 @@ echo "use_rustts %{?use_rustts}"
%patch77 -p1 -b .mozilla-1775202
%patch73 -p1 -b .build-ascii-decode-fail-rhel7
%if 0%{?rhel} == 7
%patch78 -p1 -b .build-rhel7-lower-node-min-version
%endif
# Test patches
%patch102 -p1 -b .firefox-tests-xpcshell-freeze
@ -1422,9 +1426,11 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Thu Oct 20 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.4.0-1.alma
* Tue Nov 22 2022 Eduard Abdullin <eabdullin@almalinux.org> - 102.5.0-1.alma
- Debrand for AlmaLinux
* Wed Nov 09 2022 Eike Rathke <erack@redhat.com> - 102.5.0-1
- Update to 102.5.0 build1
* Wed Oct 12 2022 Eike Rathke <erack@redhat.com> - 102.4.0-1
- Update to 102.4.0 build1
* Tue Oct 11 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-7