From 0a6102def9f321ea93f2769b428a00d9c7fee7a8 Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Wed, 26 Mar 2025 13:58:00 +0100 Subject: [PATCH 1/4] Bundled freetype2 removal and fixing icons flatpak in appdata - Freetype2 removed from the sources to avoid bundling it. - appdata for flatpak does not need to contain the tag to specify the icon name - the name is correct already as org.mozilla.Thunderbird.png Related: RHEL-84232 --- process-official-tarball | 3 +++ thunderbird.spec | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) 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/thunderbird.spec b/thunderbird.spec index 87b6053..b42ade8 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -380,7 +380,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 +1554,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 From 7a1d8dc94ab24580cb6718c1f63906fd949b839e Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Wed, 26 Mar 2025 17:49:15 +0100 Subject: [PATCH 2/4] Update to 128.9.0 build1 Resolves: RHEL-84232 --- .gitignore | 2 ++ sources | 4 ++-- thunderbird.spec | 11 +++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4e4c68b..d4538f4 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,5 @@ /thunderbird-langpacks-128.8.0esr-20250303.tar.xz /thunderbird-128.8.0esr.b5.processed-source.tar.xz /thunderbird-langpacks-128.8.0esr-20250305.tar.xz +/thunderbird-128.9.0esr.processed-source.tar.xz +/thunderbird-langpacks-128.9.0esr-20250326.tar.xz diff --git a/sources b/sources index bf89966..8c35751 100644 --- a/sources +++ b/sources @@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d -SHA512 (thunderbird-128.8.0esr.b5.processed-source.tar.xz) = 07b1645e71c26ae4f3fb2d31120bb8ad2544e9f51ccfaec484d1eddb7eeae7bd40af08385b45aed7169672f7a71f3af09d4d62cf206049d6515a9a75a1fae156 -SHA512 (thunderbird-langpacks-128.8.0esr-20250305.tar.xz) = 0e1c3067a243c838236c9effcbc42f2b673811f3d7fb8d21401eb87a55e052e18859e3e27b5235e984e6f79f44716c1682d2d6cc93c2a0e8dc55f926410d2ff1 +SHA512 (thunderbird-128.9.0esr.processed-source.tar.xz) = ea9551086be8ea8715f8e83a19162ce42400a59ff4b6d192c9b737db828f3dce325772f2e16d1438327bcb5fe1c9f54102a77b23ec2e005f0ee5a02467a311ac +SHA512 (thunderbird-langpacks-128.9.0esr-20250326.tar.xz) = b9aa3d80bc8e88ca15bdc52c9bfaf420739847d11d5035c145115d8c40bc28ed8339a467e23fb54d3e48411520e824bb24d582bcfc5b00d6376ffef872c4ab5b diff --git a/thunderbird.spec b/thunderbird.spec index b42ade8..4e668cb 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -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} +Version: 128.9.0 +Release: 1%{?dist} 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}-20250326.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1657,6 +1657,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* 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 From 5994567a1b268c497918c86ad974dd1a6f00e162 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Mon, 31 Mar 2025 17:00:27 +0200 Subject: [PATCH 3/4] Update to 128.9.0 build3 Resolves: RHEL-84232 --- sources | 4 ++-- thunderbird.spec | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/sources b/sources index 8c35751..a5e35b9 100644 --- a/sources +++ b/sources @@ -2,5 +2,5 @@ SHA512 (nspr-4.35.0-1.el8_1.src.rpm) = 5123a443fcc42602e31104999be339ae899eb7b1f SHA512 (cbindgen-vendor.tar.xz) = 0c7a40033ccd38dadd30ad064feef390444af4562be07d3dfd0c4cccc55821b01b5228ddee367d0af3bd1b4ef9b1552cdd104506579b020ac1940a7c536b8b68 SHA512 (nss-3.101.0-7.el9_2.src.rpm) = 7c325e0e437c1266031af02b3a026d20b789548ae435be6c39d710aa9d19c967ac0a79097fd50dd8ab878bf0d72c19e937d54863aa8cd0654ef2ef288e3102ec SHA512 (nss-3.101.0-7.el8_2.src.rpm) = c25551b06cf9239bb54aaf3edaea2c60804b449de4e06af4f5192bc181b5c6468ea8a69ddeff9de1b11bfc123e894b1ce8fc5d6deddfd5062f8736b75db56f8d -SHA512 (thunderbird-128.9.0esr.processed-source.tar.xz) = ea9551086be8ea8715f8e83a19162ce42400a59ff4b6d192c9b737db828f3dce325772f2e16d1438327bcb5fe1c9f54102a77b23ec2e005f0ee5a02467a311ac -SHA512 (thunderbird-langpacks-128.9.0esr-20250326.tar.xz) = b9aa3d80bc8e88ca15bdc52c9bfaf420739847d11d5035c145115d8c40bc28ed8339a467e23fb54d3e48411520e824bb24d582bcfc5b00d6376ffef872c4ab5b +SHA512 (thunderbird-128.9.0esr.b3.processed-source.tar.xz) = 445e2895574e121216467ef9d27f7fc287180257afdbb58e6b1a333dc9d26afaacacbf22588192c9ce31a84895b89998f7285eed154f458b61cf3ad9ddf9fb8d +SHA512 (thunderbird-langpacks-128.9.0esr-20250331.tar.xz) = 0d80d78e4ba833bf6b3c66e89dc88d65fa3a66332acfc4dd984a63e39f477061c5e49d06ac81f3d0c30a96fcfb3111cb0ee075efda7077d645c31cc08dd27d96 diff --git a/thunderbird.spec b/thunderbird.spec index 4e668cb..e84acd3 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -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 .b2 +%global buildnum .b3 %bcond_without langpacks @@ -138,7 +138,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird Version: 128.9.0 -Release: 1%{?dist} +Release: 2%{?dist} 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}-20250326.tar.xz +Source1: thunderbird-langpacks-%{version}%{?pre_version}-20250331.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -1657,6 +1657,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog +* 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 From 223a7902573ff651a718ca8b6a00e671fd45c368 Mon Sep 17 00:00:00 2001 From: Eike Rathke Date: Tue, 1 Apr 2025 09:07:22 +0200 Subject: [PATCH 4/4] Package interesting_serverknobs.json Related: RHEL-84232 --- thunderbird.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/thunderbird.spec b/thunderbird.spec index e84acd3..71ff903 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -1638,6 +1638,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