diff --git a/download b/download index be4cba6a02c38cdfcfef919bb81fe64fcbd87646..9ce6688f8959b7dc7082fdb09af592df58dbe845 100644 --- a/download +++ b/download @@ -1,7 +1,7 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz b3c1d2ea615cb0195f4f62b005773262 mochitest-python.tar.gz -1f353e99cd531478a7bbd04e74bc837a firefox-128.2.0esr.processed-source.tar.xz -8ee36668678fed8bf3f82d90f6428165 firefox-langpacks-128.2.0esr-20240827.tar.xz +641fb328d629112bf7ca7a110d67b948 firefox-128.3.0esr.processed-source.tar.xz +9b4dc5233089f5466650e3c17b0fcc3f firefox-langpacks-128.3.0esr-20240924.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm -a80dda6d1547e533e0ad64753d862567 nss-3.101.0-6.el8_2.src.rpm -34159eade10e31ddbcb9bebe1e74e05c nss-3.101.0-6.el9_0.src.rpm +ab085bce989de91681f48fdd05be4c0f nss-3.101.0-7.el8_2.src.rpm +dbf6357877e3e1042de1a95cdfb61507 nss-3.101.0-7.el9_2.src.rpm diff --git a/firefox.spec b/firefox.spec index eb6cd97a39941de102d5d466e41df1dcf7d720e3..227d9ec6c324d67316b5bcf3fb14017d5396fec4 100644 --- a/firefox.spec +++ b/firefox.spec @@ -13,6 +13,11 @@ %global run_firefox_tests 0 %endif +# 排除 libstdc++ 相关依赖 +%global __requires_exclude ^libstdc\\+\\+ +AutoReq: no +AutoProv: no + %{lua: function dist_to_rhel_minor(str, start) match = string.match(str, ".module%+el8.%d+") @@ -138,16 +143,11 @@ end} Summary: Mozilla Firefox Web browser Name: firefox -Version: 128.2.0 +Version: 128.3.0 Release: 1%{anolis_release}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ -# 排除 libstdc++ 相关依赖 -%global __requires_exclude ^libstdc\\+\\+ -AutoReq: no -AutoProv: no - %if 0%{?rhel} >= 9 ExcludeArch: %{ix86} %endif @@ -174,7 +174,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}%{?buildnum}.processed-source.tar.xz %if %{with langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20240827.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20240924.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -199,8 +199,8 @@ Source37: mochitest-python.tar.gz # Bundled libraries Source401: nss-setup-flags-env.inc Source402: nspr-4.35.0-1.el8_1.src.rpm -Source403: nss-3.101.0-6.el8_2.src.rpm -Source404: nss-3.101.0-6.el9_0.src.rpm +Source403: nss-3.101.0-7.el8_2.src.rpm +Source404: nss-3.101.0-7.el9_2.src.rpm # ---- RHEL specific patches --- # -- Downstream only -- @@ -268,9 +268,9 @@ BuildRequires: desktop-file-utils BuildRequires: libappstream-glib BuildRequires: libjpeg-devel BuildRequires: libstdc++-devel +BuildRequires: libstdc++-static BuildRequires: libgcc-static BuildRequires: glibc-static -BuildRequires: libstdc++-static BuildRequires: m4 BuildRequires: make BuildRequires: nasm >= 1.13 @@ -333,7 +333,7 @@ BuildRequires: rust %if 0%{?rhel} == 7 BuildRequires: cargo -BuildRequires: clang clang-libs llvm llvm-devel +BuildRequires: clang clang-libs llvm llvm-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: python3-devel @@ -1818,6 +1818,7 @@ fi %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : + # 在安装后脚本中恢复执行权限 chmod a+x %{_libdir}/firefox/libstdc++.so.6.0.29 @@ -1941,6 +1942,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Tue Sep 2 2025 zhuhongbo - 128.3.0-1.0.2 +- Update to firefox-128.3.0-2 + * Mon Sep 1 2025 zhuhongbo - 128.2.0-1.0.2 - rebrand to anolis