From 2121ea1210022087f7ee961b4440e7bbed19447e Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Mon, 25 Apr 2016 15:58:12 +0100
Subject: [PATCH] Update to 3.21.1

---
 .gitignore                       |  1 +
 gnome-software-system-apps.patch | 25 -------------------------
 gnome-software.spec              | 15 ++++++---------
 sources                          |  2 +-
 4 files changed, 8 insertions(+), 35 deletions(-)
 delete mode 100644 gnome-software-system-apps.patch

diff --git a/.gitignore b/.gitignore
index af6cb17..d9a894e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -58,3 +58,4 @@
 /gnome-software-3.20.0.tar.xz
 /gnome-software-3.20.1.tar.xz
 /gnome-software-3.20.2.tar.xz
+/gnome-software-3.21.1.tar.xz
diff --git a/gnome-software-system-apps.patch b/gnome-software-system-apps.patch
deleted file mode 100644
index 8677dc1..0000000
--- a/gnome-software-system-apps.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 046d6180e3d7d47649a055fa57f717ba9f59f1c1 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Mon, 25 May 2015 23:11:03 +0200
-Subject: [PATCH 1/2] Downstream patch to the list of unremovable system apps
-
-Replace Epiphany with Firefox; drop gnome-dictionary that isn't included
-in the default Fedora Workstation install.
----
- data/modulesets/system.xml | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/data/modulesets/system.xml b/data/modulesets/system.xml
-index d88a14e..780fba2 100644
---- a/data/modulesets/system.xml
-+++ b/data/modulesets/system.xml
-@@ -1,8 +1,8 @@
- <!-- Unremovable system apps -->
- <moduleset name="system">
-   <module type="application">eog.desktop</module>
--  <module type="application">epiphany.desktop</module>
-   <module type="application">evince.desktop</module>
-+  <module type="application">firefox.desktop</module>
-   <module type="application">gnome-calculator.desktop</module>
-   <module type="application">gnome-control-center.desktop</module>
-   <module type="application">gnome-system-monitor.desktop</module>
diff --git a/gnome-software.spec b/gnome-software.spec
index c8ca263..c4573b4 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -10,16 +10,13 @@
 
 Summary:   A software center for GNOME
 Name:      gnome-software
-Version:   3.20.2
+Version:   3.21.1
 Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
 Source0:   http://download.gnome.org/sources/gnome-software/3.20/%{name}-%{version}.tar.xz
 
-# Downstream patch to the list of unremovable system apps
-Patch0:    gnome-software-system-apps.patch
-
 Requires:  appstream-data
 %if 0%{?fedora}
 Requires:  epiphany-runtime
@@ -57,7 +54,7 @@ BuildRequires: polkit-devel
 BuildRequires: xdg-app-devel >= %{xdg_app_version}
 
 # this is not a library version
-%define gs_plugin_version               9
+%define gs_plugin_version               10
 
 %description
 gnome-software is an application that makes it easy to add, remove
@@ -65,7 +62,6 @@ and update software in the GNOME desktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .system-apps
 
 %build
 %configure --disable-static --disable-silent-rules
@@ -113,9 +109,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %dir %{_datadir}/gnome-software
 %{_datadir}/gnome-software/*.png
 %{_datadir}/appdata/*.appdata.xml
+%{_datadir}/app-info/xmls/*.xml.gz
 %{_mandir}/man1/gnome-software.1.gz
 %{_datadir}/icons/hicolor/*/apps/*
-%{_datadir}/gnome-software/featured.ini
 %{_datadir}/gnome-software/featured-*.svg
 %{_datadir}/gnome-software/featured-*.jpg
 %dir %{_libdir}/gs-plugins-%{gs_plugin_version}
@@ -125,11 +121,12 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/dbus-1/services/org.gnome.Software.service
 %{_datadir}/gnome-shell/search-providers/org.gnome.Software-search-provider.ini
 %{_datadir}/glib-2.0/schemas/org.gnome.software.gschema.xml
-%dir %{_datadir}/gnome-software/modulesets.d
-%{_datadir}/gnome-software/modulesets.d/*.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.software-fedora.gschema.override
 
 %changelog
+* Mon Apr 25 2016 Richard Hughes <rhughes@redhat.com> - 3.21.1-1
+- Update to 3.21.1
+
 * Mon Apr 25 2016 Richard Hughes <rhughes@redhat.com> - 3.20.2-1
 - Update to 3.20.1
 - Allow popular and featured apps to match any plugin
diff --git a/sources b/sources
index 2d540fc..8376be1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d0b540e6e834c44606cd8db66c8eb177  gnome-software-3.20.2.tar.xz
+1721c8b684d409a2f2c4e8a4d9bbb3bb  gnome-software-3.21.1.tar.xz