diff --git a/.gitignore b/.gitignore
index 081ccd6..6c3c825 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,5 +2,5 @@ cbindgen-vendor.tar.xz
nspr-4.35.0-1.el8_1.src.rpm
nss-3.101.0-7.el8_2.src.rpm
nss-3.101.0-7.el9_2.src.rpm
-thunderbird-128.8.0esr.b5.processed-source.tar.xz
-thunderbird-langpacks-128.8.0esr-20250305.tar.xz
+thunderbird-128.10.0esr.processed-source.tar.xz
+thunderbird-langpacks-128.10.0esr-20250428.tar.xz
diff --git a/process-official-tarball b/process-official-tarball
index 0ec4b47..c3f4077 100755
--- a/process-official-tarball
+++ b/process-official-tarball
@@ -20,6 +20,9 @@ rm -vf ./process-tarball-dir/*/third_party/python/pip/pip-24.0.dist-info/AUTHORS
rm -vf ./process-tarball-dir/*/comm/third_party/rust/idna/tests/IdnaTestV2.txt
rm -vr ./process-tarball-dir/*/comm/third_party/rust/wast/tests/parse-fail/confusing*
+# We uses system freetype2
+rm -vrf ./process-tarball-dir/*/modules/freetype2
+
processed_tarball=${1/source/processed-source}
cd ./process-tarball-dir
diff --git a/sources b/sources
index 7895b53..a6f9978 100644
--- a/sources
+++ b/sources
@@ -2,5 +2,5 @@ SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d
SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f1e2f1ea87ba4f283eb894d08ab568e421dba1df4770f23be91ff88aa6a0748bce7feef31ed88bee5bdecb2c
SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d
SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec
-SHA512 (thunderbird-128.8.0esr.b5.processed-source.tar.xz) = 07b1645e71c26ae4f3fb2d31120bb8ad2544e9f51ccfaec484d1eddb7eeae7bd40af08385b45aed7169672f7a71f3af09d4d62cf206049d6515a9a75a1fae156
-SHA512 (thunderbird-langpacks-128.8.0esr-20250305.tar.xz) = 0e1c3067a243c838236c9effcbc42f2b673811f3d7fb8d21401eb87a55e052e18859e3e27b5235e984e6f79f44716c1682d2d6cc93c2a0e8dc55f926410d2ff1
+SHA512 (thunderbird-128.10.0esr.processed-source.tar.xz) = e1c886a2992a4f5c807e707383a6d88b3fa36b233c9d6f0db3f051953ab38f4bfd012648f46333fa0a7fe45672e3ac558038c230d1c963b13093d0cc5e5cbe07
+SHA512 (thunderbird-langpacks-128.10.0esr-20250428.tar.xz) = 12e5b4a619d9a08e38fb0de77d2a9ba6ca96cb4fd22529e313d09030e8c5498c00cded08b66dd7bc78789912b9e7d5865bbea0297e6703613c99caaf4de0ae06
diff --git a/thunderbird.spec b/thunderbird.spec
index 58aa201..cb6b86f 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -35,7 +35,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el9")
if match then
- return 6
+ return 7
end
match = string.match(str, ".el10_%d+")
if match then
@@ -43,7 +43,7 @@ function dist_to_rhel_minor(str, start)
end
match = string.match(str, ".el10")
if match then
- return 0
+ return 1
end
return -1
end}
@@ -88,7 +88,7 @@ end}
%if 0%{?rhel} > 7 && 0%{?rhel} < 10
%global use_gcc_ts 1
- %if 0%{?rhel} == 9 && %{rhel_minor_version} >= 6
+ %if (0%{?rhel} == 9 && %{rhel_minor_version} >= 6) || (0%{?rhel} == 8 && %{rhel_minor_version} >= 10)
# clang depends on gcc-toolset-14-gcc-c++
%global gts_version 14
%else
@@ -127,7 +127,7 @@ end}
# If set to .b2 or .b3 ... the processed source file needs to be renamed before upload, e.g.
# thunderbird-102.8.0.b2.processed-source.tar.xz
# When unset use processed source file name as is.
-%global buildnum .b5
+#%%global buildnum .b2
%bcond_without langpacks
@@ -137,8 +137,8 @@ end}
Summary: Mozilla Thunderbird mail/newsgroup client
Name: thunderbird
-Version: 128.8.0
-Release: 2%{?dist}.alma.1
+Version: 128.10.0
+Release: 1%{?dist}.alma.1
URL: http://www.mozilla.org/projects/thunderbird/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -165,7 +165,7 @@ ExcludeArch: %{ix86}
#Source0: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.processed-source.tar.xz
Source0: thunderbird-%{version}%{?pre_version}%{?buildnum}.processed-source.tar.xz
%if %{with langpacks}
-Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250305.tar.xz
+Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250428.tar.xz
%endif
Source2: cbindgen-vendor.tar.xz
Source3: process-official-tarball
@@ -333,8 +333,9 @@ BuildRequires: gcc-toolset-%{gts_version}-runtime
BuildRequires: gcc-toolset-%{gts_version}-binutils
BuildRequires: gcc-toolset-%{gts_version}-gcc
BuildRequires: gcc-toolset-%{gts_version}-gcc-plugin-annobin
-# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-g++ instead fail
+# Do not explicitly require gcc-toolset-%%{gts_version}-gcc-c++ instead fail
# when clang is upgraded to depend on a later toolset and adjust version.
+# ERROR: The target C compiler is version 13.3.1, while the target C++ compiler is version 8.5.0. Need to use the same compiler version.
%endif
%if %{?use_openssl_for_librnp}
@@ -380,7 +381,6 @@ Provides: bundled(fathom)
Provides: bundled(fdlibm)
Provides: bundled(ffvpx)
Provides: bundled(fluent.migratetb)
-Provides: bundled(freetype2)
Provides: bundled(function2)
Provides: bundled(gbm)
Provides: bundled(gemmology)
@@ -1555,7 +1555,13 @@ touch $RPM_BUILD_ROOT%{mozappdir}/components/xpti.dat
# Register as an application to be visible in the software center
mkdir -p $RPM_BUILD_ROOT%{_datadir}/metainfo
%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml
+%if 0%{?flatpak}
+# don't specify icon for flatpak appdata, icons are correctly named and packaged already
+# as org.mozilla.Thunderbird.png
+sed -i -e 's|thunderbird|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
+%endif
# Clean the created bundled rpms.
rm -rf %{_srcrpmdir}/libffi*.src.rpm
@@ -1633,6 +1639,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%endif
%{mozappdir}/glxtest
%{mozappdir}/vaapitest
+%{mozappdir}/interesting_serverknobs.json
%if !%{?system_nss}
%exclude %{mozappdir}/libnssckbi.so
@@ -1652,9 +1659,21 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#===============================================================================
%changelog
-* Tue May 13 2025 Eduard Abdullin - 128.8.0-2.alma.1
+* Thu May 15 2025 Eduard Abdullin - 128.10.0-1.alma.1
- AlmaLinux changes
+* Mon Apr 28 2025 Eike Rathke - 128.10.0-1
+- Update to 128.10.0 build1
+
+* Wed Apr 16 2025 Eike Rathke - 128.9.2-1
+- Update to 128.9.2
+
+* Mon Mar 31 2025 Eike Rathke - 128.9.0-2
+- Update to 128.9.0 build3
+
+* Wed Mar 26 2025 Eike Rathke - 128.9.0-1
+- Update to 128.9.0 build1
+
* Wed Mar 05 2025 Eike Rathke - 128.8.0-2
- Update to 128.8.0 build5