diff --git a/.gitignore b/.gitignore index e35827a..3a65830 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,5 @@ SOURCES/cbindgen-vendor.tar.xz SOURCES/nspr-4.32.0-1.el8_1.src.rpm SOURCES/nss-3.67.0-7.el8_1.src.rpm -SOURCES/thunderbird-91.5.0.processed-source.tar.xz -SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz +SOURCES/thunderbird-91.6.0.processed-source.tar.xz +SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz diff --git a/.thunderbird.metadata b/.thunderbird.metadata index df739f9..6f336fa 100644 --- a/.thunderbird.metadata +++ b/.thunderbird.metadata @@ -1,5 +1,5 @@ c822547dbc12e2baebdfdfb38b665e23f0c2513a SOURCES/cbindgen-vendor.tar.xz b5fd1332d8e0d37339ae170c7bebcb63a40b22e0 SOURCES/nspr-4.32.0-1.el8_1.src.rpm 8fff814901e03c2518ede2f8992d898f5ba61ed9 SOURCES/nss-3.67.0-7.el8_1.src.rpm -96483930beccc90117f19d77eb57f982aad086ea SOURCES/thunderbird-91.5.0.processed-source.tar.xz -db0eadc8a9ece29e56420ad74faf0df3545acbe8 SOURCES/thunderbird-langpacks-91.5.0-20220107.tar.xz +5f4f619a433c7abc51733215a128dbc7ddb5be0c SOURCES/thunderbird-91.6.0.processed-source.tar.xz +fe71530869aeb1b6039e0ae4dfc13498c2035560 SOURCES/thunderbird-langpacks-91.6.0-20220207.tar.xz diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SPECS/thunderbird.spec b/SPECS/thunderbird.spec index 5500fae..bfff6b3 100644 --- a/SPECS/thunderbird.spec +++ b/SPECS/thunderbird.spec @@ -127,7 +127,7 @@ end} %global build_langpacks 1 Summary: Mozilla Thunderbird mail/newsgroup client Name: thunderbird -Version: 91.5.0 +Version: 91.6.0 Release: 2%{?dist} URL: http://www.mozilla.org/projects/thunderbird/ License: MPLv1.1 or GPLv2+ or LGPLv2+ @@ -150,7 +150,7 @@ ExcludeArch: s390 ppc # Link to official tarball: https://archive.mozilla.org/pub/thunderbird/releases/%%{version}%%{?pre_version}/source/thunderbird-%%{version}%%{?pre_version}.source.tar.xz Source0: thunderbird-%{version}%{?pre_version}.processed-source.tar.xz %if %{build_langpacks} -Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220107.tar.xz +Source1: thunderbird-langpacks-%{version}%{?ext_version}-20220207.tar.xz %endif Source2: cbindgen-vendor.tar.xz Source3: get-calendar-langpacks.sh @@ -1017,65 +1017,11 @@ rm -rf %{_prefix}/lib/debug/lib64/%{name}-devel-* %{__rm} -rf %{buildroot}%{mozappdir}/librnp.so # Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -%{__mkdir_p} %{buildroot}%{_datadir}/appdata -cat > %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml < - - - - mozilla-thunderbird.desktop - CC0-1.0 - MPLv1.1 or GPLv2+ or LGPLv2+ - -

- Thunderbird is an email client that allows you to read, write and organise all - of your email messages. It is compatible with most email accounts, including the - most popular webmail services. -

-

- Thunderbird is designed by Mozilla, a global community working together to make - the Internet better. Mozilla believe that the Internet should be open, public, - and accessible to everyone without any restrictions. -

-
    -
  • Easier than ever to set up a new e-mail account
    • -
  • Awesome search allows you to find your messages fast
    • -
  • Thousands of add-ons give you the freedom to make Thunderbird your own
    • -
- - http://www.mozilla.org/thunderbird/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png - - - - - - -EOF - -#--------------------------------------------------------------------- +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 -rm -rf %{_srcrpmdir}/libffi*.src.rpm -find %{_rpmdir} -name "libffi*.rpm" -delete -rm -rf %{_srcrpmdir}/openssl*.src.rpm -find %{_rpmdir} -name "openssl*.rpm" -delete -rm -rf %{_srcrpmdir}/nss*.src.rpm -find %{_rpmdir} -name "nss*.rpm" -delete -rm -rf %{_srcrpmdir}/nspr*.src.rpm -find %{_rpmdir} -name "nspr*.rpm" -delete +#=============================================================================== %post update-desktop-database &> /dev/null || : @@ -1095,7 +1041,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files -f %{name}.lang %defattr(-,root,root,-) %attr(755,root,root) %{_bindir}/thunderbird -%{_datadir}/appdata/*.appdata.xml +%{_datadir}/metainfo/*.appdata.xml %attr(644,root,root) %{_datadir}/applications/thunderbird.desktop %dir %{_datadir}/mozilla/extensions/%{thunderbird_app_id} %dir %{_libdir}/mozilla/extensions/%{thunderbird_app_id} @@ -1155,8 +1101,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #=============================================================================== %changelog -* Tue Feb 01 2022 CentOS Sources - 91.5.0-2.el9.centos -- Apply debranding changes +* Fri Feb 11 2022 Jan Horak - 91.6.0-2 +- Move appdata to metainfo and use stock icon instead of remote + +* Mon Feb 07 2022 Eike Rathke - 91.6.0-1 +- Update to 91.6.0 build1 + +* Tue Jan 18 2022 Jan Horak - 91.5.0-3 +- Using upstream appdata file * Fri Jan 14 2022 Jan Horak - 91.5.0-2 - Enabled optimalization for s390x