leigh123linux pushed to cinnamon (f20). "use new gnome-terminal desktop file name"

[notifications at fedoraproject.org]

>From 1483bc683180af5c19e30df7bd2959974b28edee Mon Sep 17 00:00:00 2001
From: leigh123linux <leigh123linux at googlemail.com>
Date: Sat, 25 Apr 2015 23:27:38 +0100
Subject: use new gnome-terminal desktop file name


diff --git a/cinnamon-fedora-22.gschema.override b/cinnamon-fedora-22.gschema.override
index df1ce5f..a473b83 100644
--- a/cinnamon-fedora-22.gschema.override
+++ b/cinnamon-fedora-22.gschema.override
@@ -1,7 +1,7 @@
 [org.cinnamon]
 desktop-effects-minimize-effect="traditional"
 enabled-applets=['panel1:left:0:menu at cinnamon.org', 'panel1:left:1:show-desktop at cinnamon.org', 'panel1:left:2:panel-launchers at cinnamon.org', 'panel1:left:3:window-list at cinnamon.org', 'panel1:right:0:notifications at cinnamon.org', 'panel1:right:1:user at cinnamon.org', 'panel1:right:2:removable-drives at cinnamon.org', 'panel1:right:3:keyboard at cinnamon.org', 'panel1:right:4:network at cinnamon.org', 'panel1:right:5:sound at cinnamon.org', 'panel1:right:6:power at cinnamon.org', 'panel1:right:7:systray at cinnamon.org', 'panel1:right:8:calendar at cinnamon.org', 'panel1:right:9:windows-quick-list at cinnamon.org']
-favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'gnome-terminal.desktop', 'nemo.desktop']
+favorite-apps=['firefox.desktop', 'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop']
 number-workspaces=4
 startup-animation=false
 workspace-expo-view-as-grid=true
diff --git a/cinnamon.spec b/cinnamon.spec
index 2e10513..6c9daa5 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -2,7 +2,7 @@
 
 Name:           cinnamon
 Version:        2.4.7
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            http://cinnamon.linuxmint.com 
@@ -27,7 +27,11 @@ Patch5:         revert_25aef37.patch
 %if 0%{?fedora} > 20
 Patch6:         cinnamon-gtk-3.14.patch
 %endif
+%if 0%{?fedora} > 21
+Patch7:         f22_default_panal_launcher.patch
+%else
 Patch7:         default_panal_launcher.patch
+%endif
 Patch8:         remove_session_bits.patch
 Patch9:         show_brightness_fix.patch
 
@@ -263,6 +267,9 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Sat Apr 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.7-4
+- use new gnome-terminal desktop file name
+
 * Sat Apr 25 2015 Leigh Scott <leigh123linux at googlemail.com> - 2.4.7-3
 - add br zukitwo-metacity-theme
 
diff --git a/f22_default_panal_launcher.patch b/f22_default_panal_launcher.patch
new file mode 100644
index 0000000..de72819
--- /dev/null
+++ b/f22_default_panal_launcher.patch
@@ -0,0 +1,11 @@
+--- a/files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json	2014-11-10 10:01:15.000000000 +0000
++++ b/files/usr/share/cinnamon/applets/panel-launchers at cinnamon.org/settings-schema.json	2014-11-18 17:00:46.521666889 +0000
+@@ -1,7 +1,7 @@
+ {
+     "launcherList": {
+         "type": "generic",
+-        "default": ["firefox.desktop", "gnome-terminal.desktop", "nemo.desktop"]
++        "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "org.gnome.Terminal.desktop", "nemo.desktop"]
+     },
+     "allow-dragging": {
+         "type": "checkbox",
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/cinnamon.git/commit/?h=f20&id=1483bc683180af5c19e30df7bd2959974b28edee