From 2c0f8edce9d5789d4b4901aa56b1fa25a36e27c9 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 6 Dec 2019 09:59:05 +0100 Subject: Remove appdata and ship metainfo only --- firefox-search-provider.ini | 2 +- firefox.metainfo.appdata.xml | 15 +++++++++++++-- firefox.spec | 46 ++++---------------------------------------- 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 @@ - org.mozilla.Firefox.desktop + firefox.desktop CC0-1.0 Firefox Web Browser @@ -25,7 +25,13 @@ =Internetový prehliadač =Webbläsare -

Browse the Web

+

Browse the Web

+ 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. +

Navegueu per el web

Prohlížení stránek World Wide Webu

Im Internet surfen

@@ -62,6 +68,11 @@ firefox.desktop + + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png + https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png + 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 < - - - - firefox.desktop - CC0-1.0 - -

- 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. -

- -
- http://www.mozilla.org/ - - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/a.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/b.png - https://raw.githubusercontent.com/hughsie/fedora-appstream/master/screenshots-extra/firefox/c.png - - -
-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 - 71.0-10 +- Remove appdata and ship metainfo only + * Wed Dec 4 2019 Martin Stransky - 71.0-9 - Included kiosk mode workaround (mozbz#1594738) -- cgit