diff --git a/download b/download index 2146f6e0257ea4faa7f27a9ecb6da5a44520f823..8ad797e6655c9db9909b3b2c0566dfc13684ab2d 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ fc25f988b87b5187d4e2f006efa699a3 cbindgen-vendor.tar.xz -77b6916af60f837fa3cca31ada307acb thunderbird-128.8.0esr.b5.processed-source.tar.xz -cefc023260ab9a77ce484460b62ff817 thunderbird-langpacks-128.8.0esr-20250305.tar.xz +7b8ae91158679800119a580b59511ef8 thunderbird-128.9.0esr.b3.processed-source.tar.xz +b9e16b1d3419e8a2017c1ede161d1c2a thunderbird-langpacks-128.9.0esr-20250331.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.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/process-official-tarball b/process-official-tarball index 0ec4b478aef812e18255a6a6f97b4bca5842531b..c3f407702502fe6cf5d3a92490a8b0b7a91243ba 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 edde6b3971bb8cec2f7f2153dd8cc5afa089f349..a29a3b34b0b6b7f70138399e3a619af62ec1da9f 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -128,7 +128,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 .b3 %bcond_without langpacks @@ -138,7 +138,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 128.8.0 +Version: 128.9.0 Release: 2%{anolis_release}%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -167,7 +167,7 @@ ExcludeArch: loongarch64 #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}-20250331.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -383,7 +383,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) @@ -1560,7 +1559,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 @@ -1638,6 +1643,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 @@ -1657,10 +1663,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Mar 18 2025 Liwei Ge - 128.8.0-2.0.1 +* Fri Apr 25 2025 Liwei Ge - 128.9.0-2.0.1 - Rebrand to Anolis - Remove loongarch64 arch(Zhao Hang) +* 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