Merge branch 'c8' into a8

This commit is contained in:
eabdullin 2024-10-07 14:20:00 +03:00
commit 22f32eeeab
3 changed files with 16 additions and 13 deletions

View File

@ -1,7 +1,7 @@
5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz 5012b69e54cbebe3b5e74011dacf3a2097f49921 SOURCES/cbindgen-vendor.tar.xz
3d283a197f4363b9afc187586213b76e95374511 SOURCES/firefox-128.2.0esr.processed-source.tar.xz febc288cf9cfecc9755fc1dac8a4680244a47366 SOURCES/firefox-128.3.0esr.processed-source.tar.xz
1303d0fc410be228a4e24e61db40939b4f9f8de0 SOURCES/firefox-langpacks-128.2.0esr-20240827.tar.xz ce0c755853b8201b92e4e29af83a82a6a61e07a5 SOURCES/firefox-langpacks-128.3.0esr-20240924.tar.xz
2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz 2d8a6b2b30d5496735f49ffe8c8a7ede3a78a5ca SOURCES/mochitest-python.tar.gz
d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm d744f92e874688cc4b5376477dfdd639a97a6cd4 SOURCES/nspr-4.35.0-1.el8_1.src.rpm
cd19fc0ba6e05b5930cfcc7c85ec8508a6d3f284 SOURCES/nss-3.101.0-6.el8_2.src.rpm f466d7213e85773e002c48897524eaf909480046 SOURCES/nss-3.101.0-7.el8_2.src.rpm
c3665cbe283450a49ab446d3044916132f1b9699 SOURCES/nss-3.101.0-6.el9_0.src.rpm 0413d22a58ba1bba99acec9c3c2a4db56a4100c7 SOURCES/nss-3.101.0-7.el9_2.src.rpm

8
.gitignore vendored
View File

@ -1,7 +1,7 @@
SOURCES/cbindgen-vendor.tar.xz SOURCES/cbindgen-vendor.tar.xz
SOURCES/firefox-128.2.0esr.processed-source.tar.xz SOURCES/firefox-128.3.0esr.processed-source.tar.xz
SOURCES/firefox-langpacks-128.2.0esr-20240827.tar.xz SOURCES/firefox-langpacks-128.3.0esr-20240924.tar.xz
SOURCES/mochitest-python.tar.gz SOURCES/mochitest-python.tar.gz
SOURCES/nspr-4.35.0-1.el8_1.src.rpm SOURCES/nspr-4.35.0-1.el8_1.src.rpm
SOURCES/nss-3.101.0-6.el8_2.src.rpm SOURCES/nss-3.101.0-7.el8_2.src.rpm
SOURCES/nss-3.101.0-6.el9_0.src.rpm SOURCES/nss-3.101.0-7.el9_2.src.rpm

View File

@ -137,7 +137,7 @@ end}
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 128.2.0 Version: 128.3.0
Release: 1%{?dist}.alma.1 Release: 1%{?dist}.alma.1
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+
@ -168,7 +168,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 # 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 Source0: firefox-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks} %if %{with langpacks}
Source1: firefox-langpacks-%{version}%{?pre_version}-20240827.tar.xz Source1: firefox-langpacks-%{version}%{?pre_version}-20240924.tar.xz
%endif %endif
Source2: cbindgen-vendor.tar.xz Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball Source3: process-official-tarball
@ -193,8 +193,8 @@ Source37: mochitest-python.tar.gz
# Bundled libraries # Bundled libraries
Source401: nss-setup-flags-env.inc Source401: nss-setup-flags-env.inc
Source402: nspr-4.35.0-1.el8_1.src.rpm Source402: nspr-4.35.0-1.el8_1.src.rpm
Source403: nss-3.101.0-6.el8_2.src.rpm Source403: nss-3.101.0-7.el8_2.src.rpm
Source404: nss-3.101.0-6.el9_0.src.rpm Source404: nss-3.101.0-7.el9_2.src.rpm
# ---- RHEL specific patches --- # ---- RHEL specific patches ---
# -- Downstream only -- # -- Downstream only --
@ -1853,9 +1853,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Sep 17 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.2.0-1.alma.1 * Mon Oct 07 2024 Eduard Abdullin <eabdullin@almalinux.org> - 128.3.0-1.alma.1
- Debrand for AlmaLinux - Debrand for AlmaLinux
* Tue Sep 24 2024 Jan Horak <jhorak@redhat.com> - 128.3.0-1
- Update to 128.3.0
* Tue Aug 27 2024 Jan Horak <jhorak@redhat.com> - 128.2.0-1 * Tue Aug 27 2024 Jan Horak <jhorak@redhat.com> - 128.2.0-1
- Update to 128.2.0 - Update to 128.2.0