diff --git a/download b/download index 1d5f619cc16e0c3a2deace025e2a1d22e157bf9b..b60682fca5d53e7dc5f72c567eb0e3bab9bea081 100644 --- a/download +++ b/download @@ -1,6 +1,6 @@ 9b999bdcf031e29a4d8ce2b6f17e778e cbindgen-vendor.tar.xz -322656f39a60b5bd18cc6726ad061657 thunderbird-115.5.0.processed-source.tar.xz -bf109bcf39465089906ba1df6f8041d0 thunderbird-langpacks-115.5.0-20231121.tar.xz +ad88f36c797d35458312c7e293449ef7 thunderbird-115.6.0.processed-source.tar.xz +2af5ce8292bb573fac54952ed212f91b thunderbird-langpacks-115.6.0-20231218.tar.xz 7b35b9a003996b1f1dbc3cd936a609f2 nspr-4.35.0-1.el8_1.src.rpm d9c9dd9619daeb43820de97b04bede45 nss-3.90.0-2.el8_1.src.rpm 5c2f6d790957733c5f0d06f8caea3b0d nss-3.90.0-3.el9_0.src.rpm diff --git a/thunderbird.spec b/thunderbird.spec index 8469f64e4da188a8f9de49531f10cf8f8314a199..e4e768b04f826ad9c000c67f48115102a454d903 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -36,7 +36,7 @@ function dist_to_rhel_minor(str, start) end match = string.match(str, ".el9") if match then - return 3 + return 4 end return -1 end} @@ -135,7 +135,7 @@ end} Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 115.5.0 +Version: 115.6.0 Release: 1%{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}-20231121.tar.xz +Source1: thunderbird-langpacks-%{version}-20231218.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: process-official-tarball @@ -295,7 +295,7 @@ BuildRequires: rust >= %{rust_version} %if 0%{?rhel} == 9 BuildRequires: cargo -BuildRequires: clang clang-libs llvm +BuildRequires: clang clang-libs llvm llvm-devel BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: python3-devel @@ -1022,8 +1022,8 @@ echo "ac_add_options --with-google-location-service-api-keyfile=`pwd`/google-loc echo "ac_add_options --with-google-safebrowsing-api-keyfile=`pwd`/google-api-key" >> .mozconfig # May result in empty --with-libclang-path= in earlier versions. -# So far this is needed only for c8s. -%if 0%{?rhel} == 8 && %{rhel_minor_version} >= 10 +# So far this is needed only for c8s/c9s. +%if (0%{?rhel} == 8 && %{rhel_minor_version} >= 10) || (0%{?rhel} == 9 && %{rhel_minor_version} >= 4) # Clang 17 upstream's detection fails, tell it where to look. echo "ac_add_options --with-libclang-path=`llvm-config --libdir`" >> .mozconfig %endif @@ -1421,9 +1421,7 @@ 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 sed -i -e 's|thunderbird|' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml" -#=============================================================================== - -%clean +# Clean the created bundled rpms. rm -rf %{_srcrpmdir}/libffi*.src.rpm find %{_rpmdir} -name "libffi*.rpm" -delete rm -rf %{_srcrpmdir}/openssl*.src.rpm @@ -1433,6 +1431,8 @@ find %{_rpmdir} -name "nss*.rpm" -delete rm -rf %{_srcrpmdir}/nspr*.src.rpm find %{_rpmdir} -name "nspr*.rpm" -delete +#=============================================================================== + %post update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : @@ -1516,10 +1516,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Thu Nov 30 2023 Liwei Ge - 115.5.0-1.0.1 +* Wed Jan 03 2024 Liwei Ge - 115.6.0-1.0.1 - Rebrand to Anolis - Remove loongarch64 arch(Zhao Hang) +* Mon Dec 18 2023 Eike Rathke - 115.6.0-1 +- Update to 115.6.0 build2 + * Tue Nov 21 2023 Eike Rathke - 115.5.0-1 - Update to 115.5.0 build1