Merge branch 'master' into f31

3 files changed, 18 insertions, 45 deletions

diff --git a/firefox-search-provider.ini b/firefox-search-provider.ini
index 22fc763..3868e3d 100644
--- a/firefox-search-provider.ini
+++ b/firefox-search-provider.ini
@@ -1,5 +1,5 @@
 [Shell Search Provider]
-DesktopId=org.mozilla.Firefox.desktop
+DesktopId=firefox.desktop
 BusName=org.mozilla.Firefox.SearchProvider
 ObjectPath=/org/mozilla/Firefox/SearchProvider
 Version=2
diff --git a/firefox.metainfo.appdata.xml b/firefox.metainfo.appdata.xml
index b6d8050..4c5c398 100644
--- a/firefox.metainfo.appdata.xml
+++ b/firefox.metainfo.appdata.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2019 Firefox contributors -->
 <component type="desktop">
-  <id>org.mozilla.Firefox.desktop</id>
+  <id>firefox.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <name>Firefox</name>
   <summary>Web Browser</summary>
@@ -25,7 +25,13 @@
   <summary xml:lang="sk">=Internetový prehliadač</summary>
   <summary xml:lang="sv">=Webbläsare</summary>
   <description>
-    <p>Browse the Web</p>
+    <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>
@@ -62,6 +68,11 @@
   <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>
diff --git a/firefox.spec b/firefox.spec
index 333d8d1..d82f89b 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -94,7 +94,7 @@ ExcludeArch: ppc64le
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        71.0
-Release:        9.kiosk%{?pre_tag}%{?dist}
+Release:        10%{?pre_tag}%{?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
@@ -713,46 +713,6 @@ done
 %{__cp} -p %{SOURCE25} \
            %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
 
-# 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=1071061
-SentUpstream: 2014-09-22
--->
-<application>
-  <id type="desktop">firefox.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <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>
-    <!-- FIXME: Needs another couple of paragraphs -->
-  </description>
-  <url type="homepage">http://www.mozilla.org/</url>
-  <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>
-  <!-- FIXME: change this to an upstream email address for spec updates
-  <updatecontact>someone_who_cares@upstream_project.org</updatecontact>
-   -->
-</application>
-EOF
-
 echo > %{name}.lang
 %if %{with langpacks}
 # Extract langpacks, make any mods needed, repack the langpack, and install it.
@@ -910,7 +870,6 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 %dir %{_sysconfdir}/%{name}/*
 %dir %{_datadir}/mozilla/extensions/*
 %dir %{_libdir}/mozilla/extensions/*
-%{_datadir}/appdata/*.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 %{_datadir}/metainfo/*.appdata.xml
 %{_datadir}/gnome-shell/search-providers/*.ini
@@ -967,6 +926,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Fri Dec 6 2019 Martin Stransky <stransky@redhat.com> - 71.0-10
+- Remove appdata and ship metainfo only
+
 * Wed Dec 4 2019 Martin Stransky <stransky@redhat.com> - 71.0-9
 - Included kiosk mode workaround (mozbz#1594738)