From 0d1e1545f084a06b597593f995f1ab1520cab154 Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Jan 15 2016 17:26:36 +0000
Subject: Update to 3.19.4


---

diff --git a/.gitignore b/.gitignore
index 3e1d7bc..fa862fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,3 +51,4 @@
 /gnome-software-3.18.1.tar.xz
 /gnome-software-3.18.2.tar.xz
 /gnome-software-3.18.3.tar.xz
+/gnome-software-3.19.4.tar.xz
diff --git a/gnome-software-adapt-to-gnome-terminal-rename.patch b/gnome-software-adapt-to-gnome-terminal-rename.patch
deleted file mode 100644
index 74c500a..0000000
--- a/gnome-software-adapt-to-gnome-terminal-rename.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 763452ac6491371e67cd42de53f59518bb191aa3 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Mon, 25 May 2015 23:13:44 +0200
-Subject: [PATCH 2/2] Adapt to gnome-terminal desktop file rename
-
-The upstream desktop file is gnome-terminal.desktop, but it's renamed to
-org.gnome.Terminal.desktop in Fedora.
----
- data/modulesets/system.xml | 2 +-
- src/gs-folders.c           | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/data/modulesets/system.xml b/data/modulesets/system.xml
-index 780fba2..a50987a 100644
---- a/data/modulesets/system.xml
-+++ b/data/modulesets/system.xml
-@@ -7,7 +7,6 @@
-   <module type="application">gnome-calculator.desktop</module>
-   <module type="application">gnome-control-center.desktop</module>
-   <module type="application">gnome-system-monitor.desktop</module>
--  <module type="application">gnome-terminal.desktop</module>
-   <module type="application">org.gnome.baobab.desktop</module>
-   <module type="application">org.gnome.Characters.desktop</module>
-   <module type="application">org.gnome.Contacts.desktop</module>
-@@ -17,6 +16,7 @@
-   <module type="application">org.gnome.Nautilus.desktop</module>
-   <module type="application">org.gnome.Screenshot.desktop</module>
-   <module type="application">org.gnome.Software.desktop</module>
-+  <module type="application">org.gnome.Terminal.desktop</module>
-   <module type="application">org.gnome.Totem.desktop</module>
-   <module type="application">yelp.desktop</module>
- </moduleset>
-diff --git a/src/gs-folders.c b/src/gs-folders.c
-index da490be..753e274 100644
---- a/src/gs-folders.c
-+++ b/src/gs-folders.c
-@@ -566,7 +566,7 @@ gs_folders_convert (void)
- 			"org.gnome.Screenshot.desktop",
- 			"gnome-system-log.desktop",
- 			"gnome-system-monitor.desktop",
--			"gnome-terminal.desktop",
-+			"org.gnome.Terminal.desktop",
- 			"gnome-tweak-tool.desktop",
- 			"gucharmap.desktop",
- 			"seahorse.desktop",
--- 
-2.5.0
-
diff --git a/gnome-software-system-apps.patch b/gnome-software-system-apps.patch
index 7b0cea2..8677dc1 100644
--- a/gnome-software-system-apps.patch
+++ b/gnome-software-system-apps.patch
@@ -13,9 +13,9 @@ 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
-@@ -2,8 +2,8 @@
+@@ -1,8 +1,8 @@
+ <!-- Unremovable system apps -->
  <moduleset name="system">
-   <module type="application">empathy.desktop</module>
    <module type="application">eog.desktop</module>
 -  <module type="application">epiphany.desktop</module>
    <module type="application">evince.desktop</module>
@@ -23,14 +23,3 @@ index d88a14e..780fba2 100644
    <module type="application">gnome-calculator.desktop</module>
    <module type="application">gnome-control-center.desktop</module>
    <module type="application">gnome-system-monitor.desktop</module>
-@@ -11,7 +11,6 @@
-   <module type="application">org.gnome.baobab.desktop</module>
-   <module type="application">org.gnome.Characters.desktop</module>
-   <module type="application">org.gnome.Contacts.desktop</module>
--  <module type="application">org.gnome.Dictionary.desktop</module>
-   <module type="application">org.gnome.DiskUtility.desktop</module>
-   <module type="application">org.gnome.font-viewer.desktop</module>
-   <module type="application">org.gnome.gedit.desktop</module>
--- 
-2.5.0
-
diff --git a/gnome-software.spec b/gnome-software.spec
index 5aec346..e5126af 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -8,8 +8,8 @@
 
 Summary:   A software center for GNOME
 Name:      gnome-software
-Version:   3.18.3
-Release:   2%{?dist}
+Version:   3.19.4
+Release:   1%{?dist}
 License:   GPLv2+
 Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
@@ -17,8 +17,6 @@ Source0:   http://download.gnome.org/sources/gnome-software/3.18/%{name}-%{versi
 
 # Downstream patch to the list of unremovable system apps
 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
 
 Requires:  appstream-data
 %if 0%{?fedora}
@@ -62,7 +60,6 @@ and update software in the GNOME desktop.
 %prep
 %setup -q
 %patch0 -p1 -b .system-apps
-%patch1 -p1 -b .gnome-terminal
 
 %build
 %configure --disable-static --disable-silent-rules
@@ -119,6 +116,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_datadir}/gnome-software/modulesets.d/*.xml
 
 %changelog
+* Fri Jan 15 2016 Richard Hughes <rhughes@redhat.com> - 3.19.4-1
+- Update to 3.19.4
+
 * Thu Dec 03 2015 Kalev Lember <klember@redhat.com> - 3.18.3-2
 - Require librsvg2 for the gdk-pixbuf svg loader
 
diff --git a/sources b/sources
index a0829c7..97e0b7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-dc93107a8fb1a2cbda6faf144a6f4537  gnome-software-3.18.3.tar.xz
+b98c22b7afdcd4489f3d09a93e37f9b9  gnome-software-3.19.4.tar.xz