From 7ed75eceec9e6a22d95cf38f317b41f4a9e48579 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Tue, 4 Feb 2020 07:21:56 +0100
Subject: [PATCH] Fix various issues with appdata, making the validation pass
 again

This should make firefox get correctly included in the distro appstream
data again.
---
 ...etainfo.appdata.xml => firefox.appdata.xml | 28 +++----------------
 firefox.spec                                  |  7 +++--
 2 files changed, 9 insertions(+), 26 deletions(-)
 rename firefox.metainfo.appdata.xml => firefox.appdata.xml (69%)

diff --git a/firefox.metainfo.appdata.xml b/firefox.appdata.xml
similarity index 69%
rename from firefox.metainfo.appdata.xml
rename to firefox.appdata.xml
index 4c5c398..4108449 100644
--- a/firefox.metainfo.appdata.xml
+++ b/firefox.appdata.xml
@@ -25,45 +25,25 @@
   <summary xml:lang="sk">=Internetový prehliadač</summary>
   <summary xml:lang="sv">=Webbläsare</summary>
   <description>
-    <p>Browse the Web<br><br>
+    <p>
       Bringing together all kinds of awesomeness to make browsing better for you.
       Get to your favorite sites quickly – even if you don’t remember the URLs.
       Type your term into the location bar (aka the Awesome Bar) and the autocomplete
       function will include possible matches from your browsing history, bookmarked
       sites and open tabs.
     </p>
-    <p xml:lang="ca">Navegueu per el web</p>
-    <p xml:lang="cs">Prohlížení stránek World Wide Webu</p>
-    <p xml:lang="de">Im Internet surfen</p>
-    <p xml:lang="es">Navegue por la web</p>
-    <p xml:lang="fa">صفحات شبکه جهانی اینترنت را مرور نمایید</p>
-    <p xml:lang="fi">Selaa Internetin WWW-sivuja</p>
-    <p xml:lang="fr">Navigue sur Internet</p>
-    <p xml:lang="hu">A világháló böngészése</p>
-    <p xml:lang="it">Esplora il web</p>
-    <p xml:lang="ja">ウェブを閲覧します</p>
-    <p xml:lang="ko">웹을 돌아 다닙니다</p>
-    <p xml:lang="nb">Surf på nettet</p>
-    <p xml:lang="nl">Verken het internet</p>
-    <p xml:lang="nn">Surf på nettet</p>
-    <p xml:lang="no">Surf på nettet</p>
-    <p xml:lang="pl">Przeglądanie stron WWW</p>
-    <p xml:lang="pt">Navegue na Internet</p>
-    <p xml:lang="pt_BR">Navegue na Internet</p>
-    <p xml:lang="sk">Prehliadanie internetu</p>
-    <p xml:lang="sv">Surfa på webben</p>
   </description>
   <url type="homepage">https://www.mozilla.org</url>
   <update_contact>stransky@redhat.com</update_contact>
-    <kudos>
+  <kudos>
     <kudo>ModernToolkit</kudo>
     <kudo>SearchProvider</kudo>
   </kudos>
   <project_group>Mozilla</project_group>
   <project_license>GPL-3.0+</project_license>
-  <developer_name> Mozilla Corporation</developer_name>
+  <developer_name>Mozilla Corporation</developer_name>
   <url type="bugtracker">https://bugzilla.mozilla.org/</url>
-  <url type=bu"help">https://support.mozilla.org/</url>
+  <url type="help">https://support.mozilla.org/</url>
   <translation type="gettext">firefox</translation>
   <provides>
     <id>firefox.desktop</id>
diff --git a/firefox.spec b/firefox.spec
index 3fc8300..da19dee 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -102,7 +102,7 @@ ExcludeArch: s390x
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        72.0.2
-Release:        2%{?dist}
+Release:        3%{?dist}
 URL:            https://www.mozilla.org/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Source0:        https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@@ -124,7 +124,7 @@ Source29:       firefox-wayland.desktop
 Source30:       firefox-x11.sh.in
 Source31:       firefox-x11.desktop
 Source32:       node-stdout-nonblocking-wrapper
-Source33:       firefox.metainfo.appdata.xml
+Source33:       firefox.appdata.xml
 Source34:       firefox-search-provider.ini
 
 # Build patches
@@ -935,6 +935,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Feb 04 2020 Kalev Lember <klember@redhat.com> - 72.0.2-3
+- Fix various issues with appdata, making the validation pass again
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 72.0.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild