From a1c2690a5f3f75c55ef3f21770c97b32219c3737 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 26 Oct 2015 08:49:53 +0100 Subject: [PATCH] Fix apps reappearing as installed a few seconds after removal https://bugzilla.redhat.com/show_bug.cgi?id=1275163 --- ...ppStream-state-when-loading-from-a-s.patch | 32 +++++++++++++++++++ gnome-software.spec | 9 +++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-Revert-Use-the-AppStream-state-when-loading-from-a-s.patch diff --git a/0001-Revert-Use-the-AppStream-state-when-loading-from-a-s.patch b/0001-Revert-Use-the-AppStream-state-when-loading-from-a-s.patch new file mode 100644 index 0000000..3bffc49 --- /dev/null +++ b/0001-Revert-Use-the-AppStream-state-when-loading-from-a-s.patch @@ -0,0 +1,32 @@ +From 8bdfdb2c8378780c0fd9b7a33f4a4df73179a496 Mon Sep 17 00:00:00 2001 +From: Kalev Lember +Date: Mon, 26 Oct 2015 08:30:43 +0100 +Subject: [PATCH] Revert "Use the AppStream state when loading from a store" + +This needs appstream-glib master to work right. With latest stable +appstream-glib 0.5.1, this commit confused gnome-software state tracking +and led to removed apps going back to the installed state a few seconds +after having removed them. + +This reverts commit 0d365593c1926d9e2fd588a5650ca1fee1b7f15a. +--- + src/plugins/gs-plugin-appstream.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/src/plugins/gs-plugin-appstream.c b/src/plugins/gs-plugin-appstream.c +index e574e89..eb430eb 100644 +--- a/src/plugins/gs-plugin-appstream.c ++++ b/src/plugins/gs-plugin-appstream.c +@@ -488,9 +488,6 @@ gs_plugin_refine_item (GsPlugin *plugin, + case AS_APP_SOURCE_KIND_METAINFO: + gs_app_set_state (app, AS_APP_STATE_INSTALLED); + break; +- case AS_APP_SOURCE_KIND_APPSTREAM: +- gs_app_set_state (app, as_app_get_state (item)); +- break; + default: + break; + } +-- +2.5.0 + diff --git a/gnome-software.spec b/gnome-software.spec index 39556b1..83e3b80 100644 --- a/gnome-software.spec +++ b/gnome-software.spec @@ -9,7 +9,7 @@ Summary: A software center for GNOME Name: gnome-software Version: 3.18.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System URL: https://wiki.gnome.org/Apps/Software @@ -20,6 +20,9 @@ Patch0: gnome-software-system-apps.patch # Downstream patch to adapt to gnome-terminal desktop file rename Patch1: gnome-software-adapt-to-gnome-terminal-rename.patch +# Backported from upstream +Patch2: 0001-Revert-Use-the-AppStream-state-when-loading-from-a-s.patch + Requires: appstream-data %if 0%{?fedora} Requires: epiphany-runtime @@ -61,6 +64,7 @@ and update software in the GNOME desktop. %setup -q %patch0 -p1 -b .system-apps %patch1 -p1 -b .gnome-terminal +%patch2 -p1 %build %configure --disable-static --disable-silent-rules @@ -117,6 +121,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : %{_datadir}/gnome-software/modulesets.d/*.xml %changelog +* Mon Oct 26 2015 Kalev Lember - 3.18.2-2 +- Fix apps reappearing as installed a few seconds after removal (#1275163) + * Thu Oct 15 2015 Kalev Lember - 3.18.2-1 - Update to 3.18.2