From 132eddfcbfddc47267958a0ad7fa0bd891fcbea9 Mon Sep 17 00:00:00 2001
From: Kalev Lember <kalevlember@gmail.com>
Date: Mon, 16 Mar 2015 13:40:09 +0100
Subject: [PATCH] Add a patch to adapt to gnome-terminal desktop file rename

---
 ...tware-adapt-to-gnome-terminal-rename.patch | 48 +++++++++++++++++++
 gnome-software.spec                           |  4 ++
 2 files changed, 52 insertions(+)
 create mode 100644 gnome-software-adapt-to-gnome-terminal-rename.patch

diff --git a/gnome-software-adapt-to-gnome-terminal-rename.patch b/gnome-software-adapt-to-gnome-terminal-rename.patch
new file mode 100644
index 0000000..5b5d7c7
--- /dev/null
+++ b/gnome-software-adapt-to-gnome-terminal-rename.patch
@@ -0,0 +1,48 @@
+From 098ce8b99ac3fe4ed6707a04d493f5b8fd39ad20 Mon Sep 17 00:00:00 2001
+From: Kalev Lember <kalevlember@gmail.com>
+Date: Mon, 16 Mar 2015 13:34:35 +0100
+Subject: [PATCH] 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/gnome.xml | 2 +-
+ src/gs-folders.c          | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/data/modulesets/gnome.xml b/data/modulesets/gnome.xml
+index e3e1ed7..a19f4c6 100644
+--- a/data/modulesets/gnome.xml
++++ b/data/modulesets/gnome.xml
+@@ -28,7 +28,6 @@
+   <module type="application">gnome-calculator.desktop</module>
+   <module type="application">gnome-disks.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>
+@@ -37,6 +36,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 0a15c90..06089c3 100644
+--- a/src/gs-folders.c
++++ b/src/gs-folders.c
+@@ -558,7 +558,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.3.2
+
diff --git a/gnome-software.spec b/gnome-software.spec
index e591563..b78a151 100644
--- a/gnome-software.spec
+++ b/gnome-software.spec
@@ -15,6 +15,8 @@ Source0:   http://download.gnome.org/sources/gnome-software/3.15/%{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}
@@ -51,6 +53,7 @@ and update software in the GNOME desktop.
 %prep
 %setup -q
 %patch0 -p1 -b .system-apps
+%patch1 -p1 -b .gnome-terminal
 
 %build
 %configure --disable-static
@@ -113,6 +116,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 * Mon Mar 16 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.92-1
 - Update to 3.15.92
 - Use license macro for the COPYING file
+- Add a patch to adapt to gnome-terminal desktop file rename
 
 * Mon Mar 02 2015 Kalev Lember <kalevlember@gmail.com> - 3.15.91-1
 - Update to 3.15.91