Replace gnome-system-log with gnome-logs in the system apps list

gnome-software-system-apps-firefox.patch

@@ -1,26 +0,0 @@
-From 7e254824b6ca25e11140b695b360d35de95e7b10 Mon Sep 17 00:00:00 2001
-From: Kalev Lember <kalevlember@gmail.com>
-Date: Sun, 3 Aug 2014 10:37:27 +0200
-Subject: [PATCH] Downstream patch to replace Epiphany with Firefox in system
- apps
-
----
- data/modulesets/gnome.xml | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
-index d3689e8..2bd89f5 100644
---- a/data/modulesets/gnome.xml
-+++ b/data/modulesets/gnome.xml
-@@ -23,7 +23,7 @@
- <moduleset name="system">
-   <module type="application">empathy.desktop</module>
-   <module type="application">eog.desktop</module>
--  <module type="application">epiphany.desktop</module>
-+  <module type="application">firefox.desktop</module>
-   <module type="application">evince.desktop</module>
-   <module type="application">gnome-calculator.desktop</module>
-   <module type="application">gnome-dictionary.desktop</module>
--- 
-2.0.4
-

gnome-software-system-apps.patch

@@ -0,0 +1,41 @@
+From c7feb5464fee66feb68aea38bee4664662efe86b Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Tue, 16 Sep 2014 15:30:39 +0200
+Subject: [PATCH] Downstream patch to the list of unremovable system apps
+
+Replace Epiphany with Firefox, gnome-system-log with gnome-logs, and
+drop baobab that isn't shipped at all in the Workstation default
+install.
+---
+ data/modulesets/gnome.xml | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
+index 7fe8cce..7432132 100644
+--- a/data/modulesets/gnome.xml
++++ b/data/modulesets/gnome.xml
+@@ -23,19 +23,18 @@
+ <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>
++  <module type="application">firefox.desktop</module>
+   <module type="application">gnome-calculator.desktop</module>
+   <module type="application">gnome-dictionary.desktop</module>
+   <module type="application">gnome-disks.desktop</module>
+-  <module type="application">gnome-system-log.desktop</module>
+   <module type="application">gnome-system-monitor.desktop</module>
+   <module type="application">gnome-terminal.desktop</module>
+   <module type="application">gucharmap.desktop</module>
+-  <module type="application">org.gnome.baobab.desktop</module>
+   <module type="application">org.gnome.Contacts.desktop</module>
+   <module type="application">org.gnome.font-viewer.desktop</module>
+   <module type="application">org.gnome.gedit.desktop</module>
++  <module type="application">org.gnome.Logs.desktop</module>
+   <module type="application">org.gnome.Nautilus.desktop</module>
+   <module type="application">org.gnome.Screenshot.desktop</module>
+   <module type="application">org.gnome.Software.desktop</module>
+-- 
+2.1.0
+

gnome-software.spec

@@ -7,8 +7,8 @@ Group:     Applications/System
 URL:       https://wiki.gnome.org/Apps/Software
 Source0:   http://download.gnome.org/sources/gnome-software/3.13/%{name}-%{version}.tar.xz
 
-# Replace Epiphany with Firefox in the system apps list
-Patch0:    gnome-software-system-apps-firefox.patch
+# Downstream patch to the list of unremovable system apps
+Patch0:    gnome-software-system-apps.patch
 
 Requires:  appstream-data
 Requires:  epiphany-runtime
@@ -37,7 +37,7 @@ and update software in the GNOME desktop.
 
 %prep
 %setup -q
-%patch0 -p1 -b .firefox
+%patch0 -p1 -b .system-apps
 
 %build
 %configure --disable-static
@@ -98,6 +98,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %changelog
 * Tue Sep 16 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.92-1
 - Update to 3.13.92
+- Replace gnome-system-log with gnome-logs in the system apps list
 
 * Tue Sep 02 2014 Kalev Lember <kalevlember@gmail.com> - 3.13.91-1
 - Update to 3.13.91