From 0f4eac5eea58e02e7c57ab72570967fa27d154db Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Fri, 11 Feb 2022 14:21:22 +0100
Subject: [PATCH] Resolves: #2051925 Move appdata to metainfo and use stock
 icon instead of remote

---
 thunderbird.spec | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/thunderbird.spec b/thunderbird.spec
index aae16fe..c3ec41f 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -128,7 +128,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        91.6.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -1017,8 +1017,9 @@ 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
-mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata
-%{__cp} -p comm/mail/branding/%{name}/net.thunderbird.Thunderbird.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/thunderbird.appdata.xml
+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|<icon .*|<icon type="stock">thunderbird</icon>' "$RPM_BUILD_ROOT%{_datadir}/metainfo/thunderbird.appdata.xml"
 
 #===============================================================================
 
@@ -1040,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}
@@ -1100,6 +1101,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Fri Feb 11 2022 Jan Horak <jhorak@redhat.com> - 91.6.0-2
+- Move appdata to metainfo and use stock icon instead of remote
+
 * Mon Feb 07 2022 Eike Rathke <erack@redhat.com> - 91.6.0-1
 - Update to 91.6.0 build1