Compare commits

...

No commits in common. "changed/a9/firefox-115.6.0-1.el9_3.alma" and "c8" have entirely different histories.

6 changed files with 56 additions and 25 deletions

View File

@ -1,6 +1,6 @@
b963b16f6879c5dbe6e33a3a3da058b494453922 SOURCES/cbindgen-vendor.tar.xz
3f01e727d6f69c743a7fac6ccee8c2feb5c883ff SOURCES/firefox-115.6.0esr.processed-source.tar.xz
76e4af93eb2372f845f59693b080717beb33d793 SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
390c5bc3d9df2baf3e969203e4827e096c4c7f69 SOURCES/firefox-115.11.0esr.processed-source.tar.xz
11b5c428a7e73076351e2d0e344e513db8186a04 SOURCES/firefox-langpacks-115.11.0esr-20240507.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
9555ba179bc1398fbacfa2896e45f3808d94ecd2 SOURCES/nss-3.90.0-3.el8_1.src.rpm

4
.gitignore vendored
View File

@ -1,6 +1,6 @@
SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-115.6.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-115.6.0esr-20231212.tar.xz
SOURCES/firefox-115.11.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-115.11.0esr-20240507.tar.xz
SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.90.0-3.el8_1.src.rpm

View File

@ -1,11 +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
--- firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py.lower-node-min-version 2024-02-12 21:53:56.000000000 +0200
+++ firefox-115.8.0/python/mozbuild/mozbuild/nodeutil.py 2024-02-14 16:48:12.476182627 +0200
@@ -13,7 +13,7 @@ from mozboot.util import get_tools_dir
from mozfile import which
from packaging.version import Version
from six import PY3
-NODE_MIN_VERSION = StrictVersion("12.22.12")
+NODE_MIN_VERSION = StrictVersion("10.24.0")
NPM_MIN_VERSION = StrictVersion("6.14.16")
-NODE_MIN_VERSION = Version("12.22.12")
+NODE_MIN_VERSION = Version("10.24.0")
NPM_MIN_VERSION = Version("6.14.16")

View File

@ -1,9 +1,9 @@
[Global]
id=almalinux
id=fedora
version=1.0
about=Mozilla Firefox for AlmaLinux
about=Mozilla Firefox for Fedora
[Preferences]
app.distributor=almalinux
app.distributor.channel=almalinux
app.partner.fedora=almalinux
app.distributor=fedora
app.distributor.channel=fedora
app.partner.fedora=fedora

View File

@ -36,7 +36,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
return 4
return 5
end
return -1
end}
@ -122,7 +122,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
# firefox-102.8.0esr.b2.processed-source.tar.xz
# When unset use processed source file name as is.
##global buildnum .b2
##global buildnum .b2
%bcond_without langpacks
@ -132,8 +132,8 @@ end}
Summary: Mozilla Firefox Web browser
Name: firefox
Version: 115.6.0
Release: 1%{?dist}.alma
Version: 115.11.0
Release: 1%{?dist}
URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@ -163,12 +163,12 @@ 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}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20231212.tar.xz
Source1: firefox-langpacks-%{version}%{?pre_version}-20240507.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
Source10: firefox-mozconfig
Source12: firefox-almalinux-default-prefs.js
Source12: firefox-redhat-default-prefs.js
Source20: firefox.desktop
Source21: firefox.sh.in
Source23: firefox.1
@ -1122,8 +1122,8 @@ echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc
echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig
# May result in empty --with-libclang-path= in earlier versions.
# So far this is needed only for c8s/c9s.
%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) || (0%{?rhel} == 9 && %{rhel_minor_version} >= 4)
# So far this is needed only for c8s.
%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10
# Clang 17 upstream's detection fails, tell it where to look.
echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig
%endif
@ -1740,11 +1740,34 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
* Wed Jan 03 2024 Eduard Abdullin <eabdullin@almalinux.org> - 115.6.0-1.alma
- Debrand for AlmaLinux
* Tue May 07 2024 Eike Rathke <erack@redhat.com> - 115.11.0-1
- Update to 115.11.0 build1
* Tue Apr 09 2024 Eike Rathke <erack@redhat.com> - 115.10.0-1
- Update to 115.10.0 build1
* Tue Apr 09 2024 Jan Horak <jhorak@redhat.com> - 115.9.1-2
- Removed expat CVE fix
* Fri Mar 22 2024 Eike Rathke <erack@redhat.com> - 115.9.1-1
- Update to 115.9.1
* Fri Mar 15 2024 Eike Rathke <erack@redhat.com> - 115.9.0-2
- Update to 115.9.0 build2
* Tue Mar 12 2024 Eike Rathke <erack@redhat.com> - 115.9.0-1
- Update to 115.9.0 build1
- Fix expat CVE-2023-52425
* Tue Feb 13 2024 Eike Rathke <erack@redhat.com> - 115.8.0-1
- Update to 115.8.0 build1
* Tue Jan 16 2024 Eike Rathke <erack@redhat.com> - 115.7.0-1
- Update to 115.7.0 build1
* Tue Dec 12 2023 Eike Rathke <erack@redhat.com> - 115.6.0-1
- Update to 115.6.0 build1
* Tue Nov 14 2023 Eike Rathke <erack@redhat.com> - 115.5.0-1
- Update to 115.5.0 build1
@ -1773,6 +1796,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Thu May 04 2023 Eike Rathke <erack@redhat.com> - 102.11.0-2
- Update to 102.11.0 build2
* Tue May 02 2023 Eike Rathke <erack@redhat.com> - 102.11.0-1
- Update to 102.11.0 build1
@ -1781,6 +1805,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Fri Mar 10 2023 Eike Rathke <erack@redhat.com> - 102.9.0-4
- Update to 102.9.0 build2
* Thu Mar 09 2023 Jan Horak <jhorak@redhat.com> - 102.9.0-2
- removed disable-openh264-download
@ -1789,25 +1814,31 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
* Tue Feb 14 2023 Eike Rathke <erack@redhat.com> - 102.8.0-2
- Update to 102.8.0 build2
* Tue Feb 07 2023 Eike Rathke <erack@redhat.com> - 102.8.0-1
- Update to 102.8.0 build1
* Tue Jan 10 2023 Eike Rathke <erack@redhat.com> - 102.7.0-1
- Update to 102.7.0 build1
* Mon Jan 02 2023 Jan Horak <jhorak@redhat.com> - 102.6.0-2
- Add firefox-x11 subpackage to allow explicit run of firefox under x11 on RHEL9
* Tue Dec 06 2022 Eike Rathke <erack@redhat.com> - 102.6.0-1
- Update to 102.6.0 build1
* Fri Nov 25 2022 Jan Horak <jhorak@redhat.com> - 102.5.0-2
- Added libwebrtc screencast patch for newer features
* 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
- Fix for expat CVE-2022-40674 and non functional webrtc
* Tue Sep 13 2022 Jan Horak <jhorak@redhat.com> - 102.3.0-6
- Update to 102.3.0 build1