From 50ca224110fbce6b4de5d99d0cdf4679311daf21 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 16 Jan 2017 18:14:51 +0100 Subject: [PATCH] Fix epiphany showing up twice in gnome-software --- ...ule-that-classifies-apps-as-web-apps.patch | 28 +++++++++++++++++++ libappstream-glib.spec | 9 +++++- 2 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-Tighten-a-rule-that-classifies-apps-as-web-apps.patch diff --git a/0001-Tighten-a-rule-that-classifies-apps-as-web-apps.patch b/0001-Tighten-a-rule-that-classifies-apps-as-web-apps.patch new file mode 100644 index 0000000..c9ec044 --- /dev/null +++ b/0001-Tighten-a-rule-that-classifies-apps-as-web-apps.patch @@ -0,0 +1,28 @@ +From ab04101afcdf8b2cd69c2d3b8e80361b99f00044 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 16 Jan 2017 13:31:59 +0100 +Subject: [PATCH] Tighten a rule that classifies apps as web-apps + +... so that Epiphany itself wouldn't get classified as one. + +https://bugzilla.gnome.org/show_bug.cgi?id=776860 +--- + libappstream-glib/as-app-desktop.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libappstream-glib/as-app-desktop.c b/libappstream-glib/as-app-desktop.c +index 42e6132..d769539 100644 +--- a/libappstream-glib/as-app-desktop.c ++++ b/libappstream-glib/as-app-desktop.c +@@ -497,7 +497,7 @@ as_app_parse_desktop_file (AsApp *app, + G_KEY_FILE_DESKTOP_KEY_EXEC, + NULL); + if (exec != NULL) { +- if (g_str_has_prefix (exec, "epiphany")) ++ if (g_str_has_prefix (exec, "epiphany --application-mode")) + as_app_set_kind (app, AS_APP_KIND_WEB_APP); + } + } +-- +2.9.3 + diff --git a/libappstream-glib.spec b/libappstream-glib.spec index 1a627a5..6d684e9 100644 --- a/libappstream-glib.spec +++ b/libappstream-glib.spec @@ -6,11 +6,14 @@ Summary: Library for AppStream metadata Name: libappstream-glib Version: 0.6.7 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ URL: http://people.freedesktop.org/~hughsient/appstream-glib/ Source0: http://people.freedesktop.org/~hughsient/appstream-glib/releases/appstream-glib-%{version}.tar.xz +# Backported from upstream +Patch0: 0001-Tighten-a-rule-that-classifies-apps-as-web-apps.patch + BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: libtool BuildRequires: docbook-utils @@ -82,6 +85,7 @@ GLib headers and libraries for appstream-builder. %prep %setup -q -n appstream-glib-%{version} +%patch0 -p1 %build %configure \ @@ -150,6 +154,9 @@ make install DESTDIR=$RPM_BUILD_ROOT %{_datadir}/gir-1.0/AppStreamBuilder-1.0.gir %changelog +* Mon Jan 16 2017 Kalev Lember 0.6.7-2 +- Fix epiphany showing up twice in gnome-software + * Thu Jan 12 2017 Richard Hughes 0.6.7-1 - New upstream release - Add AsRequire as a way to store runtime requirements