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: Fix various issues with appdata, making the validation pass again

This should make firefox get correctly included in the distro appstream
data again.
---
 firefox.appdata.xml          | 59 +++++++++++++++++++++++++++++++++
 firefox.metainfo.appdata.xml | 79 --------------------------------------------
 firefox.spec                 |  7 ++--
 3 files changed, 64 insertions(+), 81 deletions(-)
 create mode 100644 firefox.appdata.xml
 delete mode 100644 firefox.metainfo.appdata.xml

diff --git a/firefox.appdata.xml b/firefox.appdata.xml
new file mode 100644
index 0000000..4108449
--- /dev/null
+++ b/firefox.appdata.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2019 Firefox contributors -->
+<component type="desktop">
+  <id>firefox.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <name>Firefox</name>
+  <summary>Web Browser</summary>
+  <summary xml:lang="ca">=Navegador web</summary>
+  <summary xml:lang="cs">=Webový prohlížeč</summary>
+  <summary xml:lang="es">=Navegador web</summary>
+  <summary xml:lang="fa">=مرورگر اینترنتی</summary>
+  <summary xml:lang="fi">=WWW-selain</summary>
+  <summary xml:lang="fr">=Navigateur Web</summary>
+  <summary xml:lang="hu">=Webböngésző</summary>
+  <summary xml:lang="it">=Browser Web</summary>
+  <summary xml:lang="ja">=ウェブ・ブラウザ</summary>
+  <summary xml:lang="ko">=웹 브라우저</summary>
+  <summary xml:lang="nb">=Nettleser</summary>
+  <summary xml:lang="nl">=Webbrowser</summary>
+  <summary xml:lang="nn">=Nettlesar</summary>
+  <summary xml:lang="no">=Nettleser</summary>
+  <summary xml:lang="pl">=Przeglądarka WWW</summary>
+  <summary xml:lang="pt">=Navegador Web</summary>
+  <summary xml:lang="pt_BR">=Navegador Web</summary>
+  <summary xml:lang="sk">=Internetový prehliadač</summary>
+  <summary xml:lang="sv">=Webbläsare</summary>
+  <description>
+    <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>
+  </description>
+  <url type="homepage">https://www.mozilla.org</url>
+  <update_contact>stransky@redhat.com</update_contact>
+  <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>
+  <url type="bugtracker">https://bugzilla.mozilla.org/</url>
+  <url type="help">https://support.mozilla.org/</url>
+  <translation type="gettext">firefox</translation>
+  <provides>
+    <id>firefox.desktop</id>
+  </provides>
+  <screenshots>
+    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png</screenshot>
+    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png</screenshot>
+  </screenshots>
+  <releases>
+    <release date="2019-11-13" version="3.34.0"/>
+  </releases>
+</component>
diff --git a/firefox.metainfo.appdata.xml b/firefox.metainfo.appdata.xml
deleted file mode 100644
index 4c5c398..0000000
--- a/firefox.metainfo.appdata.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2019 Firefox contributors -->
-<component type="desktop">
-  <id>firefox.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <name>Firefox</name>
-  <summary>Web Browser</summary>
-  <summary xml:lang="ca">=Navegador web</summary>
-  <summary xml:lang="cs">=Webový prohlížeč</summary>
-  <summary xml:lang="es">=Navegador web</summary>
-  <summary xml:lang="fa">=مرورگر اینترنتی</summary>
-  <summary xml:lang="fi">=WWW-selain</summary>
-  <summary xml:lang="fr">=Navigateur Web</summary>
-  <summary xml:lang="hu">=Webböngésző</summary>
-  <summary xml:lang="it">=Browser Web</summary>
-  <summary xml:lang="ja">=ウェブ・ブラウザ</summary>
-  <summary xml:lang="ko">=웹 브라우저</summary>
-  <summary xml:lang="nb">=Nettleser</summary>
-  <summary xml:lang="nl">=Webbrowser</summary>
-  <summary xml:lang="nn">=Nettlesar</summary>
-  <summary xml:lang="no">=Nettleser</summary>
-  <summary xml:lang="pl">=Przeglądarka WWW</summary>
-  <summary xml:lang="pt">=Navegador Web</summary>
-  <summary xml:lang="pt_BR">=Navegador Web</summary>
-  <summary xml:lang="sk">=Internetový prehliadač</summary>
-  <summary xml:lang="sv">=Webbläsare</summary>
-  <description>
-    <p>Browse the Web<br><br>
-      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>
-    <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>
-  <url type="bugtracker">https://bugzilla.mozilla.org/</url>
-  <url type=bu"help">https://support.mozilla.org/</url>
-  <translation type="gettext">firefox</translation>
-  <provides>
-    <id>firefox.desktop</id>
-  </provides>
-  <screenshots>
-    <screenshot type="default">https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png</screenshot>
-    <screenshot>https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png</screenshot>
-  </screenshots>
-  <releases>
-    <release date="2019-11-13" version="3.34.0"/>
-  </releases>
-</component>
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
 
-- 
cgit