Accepting request 389232 from GNOME:Factory

Resub rebased sub. (forwarded request 387957 from Zaitor)

OBS-URL: https://build.opensuse.org/request/show/389232
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gnome-software?expand=0&rev=29

gnome-software-3.20.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:3d2e187b8f0c70e5b5e0841b123310bd3bf961a47e23fcca106a84ea92b80b70
-size 3169944

gnome-software-3.20.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:c5f5db23322c4cd946cd20735ced01515e4756c3d8cae1f16d24b6bf13197bc6
+size 3176204

gnome-software-PK-updates.patch

@@ -1,13 +0,0 @@
-Index: gnome-software-3.11.1/src/gs-application.c
-===================================================================
---- gnome-software-3.11.1.orig/src/gs-application.c
-+++ gnome-software-3.11.1/src/gs-application.c
-@@ -110,7 +110,7 @@ gs_application_initialize_plugins (GsApp
- 		exit (1);
- 	}
- 	gs_plugin_loader_set_enabled (app->plugin_loader,
--				      "packagekit-updates", FALSE);
-+				      "packagekit-updates", TRUE);
- 
- 	/* show the priority of each plugin */
- 	gs_plugin_loader_dump_state (app->plugin_loader);

gnome-software-icon-crash.patch

@@ -0,0 +1,26 @@
+From 2911419f0d496e3f0e8708cfed75e5cecee2226b Mon Sep 17 00:00:00 2001
+From: Mike Gorse <mgorse@suse.com>
+Date: Mon, 11 Apr 2016 16:53:14 -0500
+Subject: [PATCH] Don't crash if unable to find a cached icon
+
+https://bugzilla.gnome.org/show_bug.cgi?id=764921
+---
+ src/plugins/gs-appstream.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/plugins/gs-appstream.c b/src/plugins/gs-appstream.c
+index 4ddd0d2..953dc7e 100644
+--- a/src/plugins/gs-appstream.c
++++ b/src/plugins/gs-appstream.c
+@@ -87,7 +87,7 @@ gs_refine_item_pixbuf (GsPlugin *plugin, GsApp *app, AsApp *item)
+ 			icon = as_app_get_icon_for_size (item, 64, 64);
+ 		if (icon == NULL) {
+ 			g_warning ("failed to find cached icon %s",
+-				   as_icon_get_name (icon));
++				   as_app_get_name (item, NULL));
+ 			return;
+ 		}
+ 		if (!as_icon_load (icon, AS_ICON_LOAD_FLAG_SEARCH_SIZE, &error)) {
+-- 
+2.6.2
+

gnome-software.changes

@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Apr 12 08:45:22 UTC 2016 - dimstar@opensuse.org
+
+- Update to version 3.20.1:
+  + Do not make the ODRS functionality depend on xdg-app.
+  + Fix live installing firmware.
+  + Support unlocking fwupd devices.
+  + Updated translations.
+- Drop gnome-software-PK-updates.patch: it has been disabled for
+  two years.
+
+-------------------------------------------------------------------
+Mon Apr 11 22:06:54 UTC 2016 - mgorse@suse.com
+
+- Add gnome-software-icon-crash.patch: fix crash when unable to
+  find icon (boo#974806 bgo#764921).
+
 -------------------------------------------------------------------
 Mon Mar 21 14:42:27 UTC 2016 - dimstar@opensuse.org
 

gnome-software.spec

@@ -17,7 +17,7 @@
 
 
 Name:           gnome-software
-Version:        3.20.0
+Version:        3.20.1
 Release:        0
 %define gs_plugin_api 9
 Summary:        GNOME Software Store
@@ -25,10 +25,10 @@ License:        GPL-2.0+
 Group:          System/GUI/GNOME
 Url:            https://wiki.gnome.org/Design/Apps/Software
 Source:         http://download.gnome.org/sources/gnome-software/3.20/%{name}-%{version}.tar.xz
-# PATCH-FEATURE-OPENSUSE gnome-software-PK-updates.patch dimstar@opensuse.org -- Switch to PackageKit Update provider instead of systemd offline updates.
-Patch0:         gnome-software-PK-updates.patch
 # PATCH-FEATURE-OPENSUSE gnome-software-add-default-yast-appfolder.patch boo#897713 badshah400@gmail.com -- Adds a YaST app-folder by default, in addition to existing app-folders Sundry and Utilities
-Patch1:         gnome-software-add-default-yast-appfolder.patch
+Patch0:         gnome-software-add-default-yast-appfolder.patch
+# PATCH-FIX-UPSTREAM gnome-software-icon-crash.patch boo#974806 mgorse@suse.com -- don't crash if unable to find a cached icon.
+Patch1:         gnome-software-icon-crash.patch
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  update-desktop-files
@@ -59,8 +59,7 @@ AppStore like management of Applications for your GNOME Desktop.
 
 %prep
 %setup -q
-# Disables - let's try the systemd offline updater
+%patch0 -p1
-#patch0 -p1
 %patch1 -p1
 
 %build