From 37a910bc39bf31cf9aeaf023c89ab66f9d8795ea Mon Sep 17 00:00:00 2001
From: Jan Horak <jhorak@redhat.com>
Date: Tue, 18 Jan 2022 14:21:18 +0100
Subject: [PATCH] Resolves: #2037148 Using upstream appdata file

---
 thunderbird.spec | 66 +++++-------------------------------------------
 1 file changed, 7 insertions(+), 59 deletions(-)

diff --git a/thunderbird.spec b/thunderbird.spec
index 433fcdf..9abc486 100644
--- a/thunderbird.spec
+++ b/thunderbird.spec
@@ -128,7 +128,7 @@ end}
 Summary:        Mozilla Thunderbird mail/newsgroup client
 Name:           thunderbird
 Version:        91.5.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            http://www.mozilla.org/projects/thunderbird/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -1017,65 +1017,10 @@ 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 <<EOF
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Richard Hughes <richard@hughsie.com> -->
-<!--
-BugReportURL: https://bugzilla.mozilla.org/show_bug.cgi?id=1071065
-SentUpstream: 2014-09-22
--->
-<application>
-  <id type="desktop">mozilla-thunderbird.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <project_license>MPLv1.1 or GPLv2+ or LGPLv2+</project_license>
-  <description>
-    <p>
-      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.
-    </p>
-    <p>
-      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.
-    </p>
-    <ul>
-      <li>Easier than ever to set up a new e-mail account</li>
-      <li>Awesome search allows you to find your messages fast</li>
-      <li>Thousands of add-ons give you the freedom to make Thunderbird your own</li>
-    </ul>
-  </description>
-  <url type="homepage">http://www.mozilla.org/thunderbird/</url>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/mozilla-thunderbird/a.png</screenshot>
-  </screenshots>
-  <releases>
-    <release version="%{version}" date="$(date '+%F')"/>
-  </releases>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
+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
 
-#---------------------------------------------------------------------
-
-%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 || :
@@ -1155,6 +1100,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #===============================================================================
 
 %changelog
+* Tue Jan 18 2022 Jan Horak <jhorak@redhat.com> - 91.5.0-3
+- Using upstream appdata file
+
 * Fri Jan 14 2022 Jan Horak <jhorak@redhat.com> - 91.5.0-2
 - Enabled optimalization for s390x