From 406deb507c516ac30136ee2acffe34c1da8bcdc879ead1560cfd96af107e0eb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= <zaitor@opensuse.org>
Date: Fri, 29 Apr 2016 12:05:46 +0000
Subject: [PATCH] Accepting request 391581 from GNOME:Next

1

OBS-URL: https://build.opensuse.org/request/show/391581
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gnome-software?expand=0&rev=81
---
 gnome-software-3.20.1.tar.xz                |  3 ---
 gnome-software-3.20.2.tar.xz                |  3 +++
 gnome-software.changes                      | 20 +++++++++++++++++
 gnome-software.spec                         |  5 ++++-
 gs-compile-against-old-appstream-glib.patch | 24 +++++++++++++++++++++
 5 files changed, 51 insertions(+), 4 deletions(-)
 delete mode 100644 gnome-software-3.20.1.tar.xz
 create mode 100644 gnome-software-3.20.2.tar.xz
 create mode 100644 gs-compile-against-old-appstream-glib.patch

diff --git a/gnome-software-3.20.1.tar.xz b/gnome-software-3.20.1.tar.xz
deleted file mode 100644
index 3cded6c..0000000
--- a/gnome-software-3.20.1.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:c5f5db23322c4cd946cd20735ced01515e4756c3d8cae1f16d24b6bf13197bc6
-size 3176204
diff --git a/gnome-software-3.20.2.tar.xz b/gnome-software-3.20.2.tar.xz
new file mode 100644
index 0000000..8d1833a
--- /dev/null
+++ b/gnome-software-3.20.2.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7e12b48443eeff82d309d971798d3758f48e08b681d192b5bdeaadf4a4bbb40f
+size 3500540
diff --git a/gnome-software.changes b/gnome-software.changes
index 5817c70..9af8a1f 100644
--- a/gnome-software.changes
+++ b/gnome-software.changes
@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Mon Apr 25 14:25:43 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 3.20.2:
+  + Allow popular and featured apps to match any plugin.
+  + Do not make the ODRS plugin depend on xdg-app.
+  + Fix many of the os-upgrade issues and implement the latest
+    mockups.
+  + Fix several issues when running on Unity.
+  + Make all the plugins more threadsafe.
+  + Return all update descriptions newer than the installed
+    version.
+  + Show some non-fatal error messages if installing fails.
+  + Use a background PackageKit transaction when downloading
+    upgrades.
+  + Updated translations.
+- Add gs-compile-against-old-appstream-glib.patch: Fix build
+  against the appstream-glib we currently have, patch from
+  upstream git.
+
 -------------------------------------------------------------------
 Tue Apr 12 08:45:22 UTC 2016 - dimstar@opensuse.org
 
diff --git a/gnome-software.spec b/gnome-software.spec
index b9600d2..8df30e0 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -17,7 +17,7 @@
 
 
 Name:           gnome-software
-Version:        3.20.1
+Version:        3.20.2
 Release:        0
 %define gs_plugin_api 9
 Summary:        GNOME Software Store
@@ -29,6 +29,8 @@ Source:         http://download.gnome.org/sources/gnome-software/3.20/%{name}-%{
 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
+# PATCH-FIX-UPSTREAM gs-compile-against-old-appstream-glib.patch zaitor@opensuse.org -- Support compiling against old versions of appstream-glib
+Patch2:         gs-compile-against-old-appstream-glib.patch
 BuildRequires:  intltool >= 0.35.0
 BuildRequires:  suse-xsl-stylesheets
 BuildRequires:  update-desktop-files
@@ -61,6 +63,7 @@ AppStore like management of Applications for your GNOME Desktop.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %configure \
diff --git a/gs-compile-against-old-appstream-glib.patch b/gs-compile-against-old-appstream-glib.patch
new file mode 100644
index 0000000..33eeb6a
--- /dev/null
+++ b/gs-compile-against-old-appstream-glib.patch
@@ -0,0 +1,24 @@
+From d73cb3ed65f1414662452cdd8cf85ae6835ebecf Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard@hughsie.com>
+Date: Mon, 25 Apr 2016 15:59:22 +0100
+Subject: trivial: Support compiling against old versions of appstream-glib
+
+---
+ src/gs-app.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/gs-app.h b/src/gs-app.h
+index 6cb48c2..d546673 100644
+--- a/src/gs-app.h
++++ b/src/gs-app.h
+@@ -78,6 +78,7 @@ typedef enum {
+ #endif
+ 
+ #if !AS_CHECK_VERSION(0,5,14)
++#define AS_APP_QUIRK_NEEDS_REBOOT		(1 << 4)
+ #define AS_APP_QUIRK_NOT_REVIEWABLE		(1 << 5)
+ #endif
+ 
+-- 
+cgit v0.12
+