From 6d23a8d96b0258ad4123a50696ee71ccf23983dd Mon Sep 17 00:00:00 2001
From: Björn Esser <besser82@fedoraproject.org>
Date: Nov 21 2017 21:38:44 +0000
Subject: Revert from Tilix to Gnome Terminal


---

diff --git a/cinnamon-fedora-27.gschema.override b/cinnamon-fedora-27.gschema.override
index b974561..d0c62f3 100644
--- a/cinnamon-fedora-27.gschema.override
+++ b/cinnamon-fedora-27.gschema.override
@@ -1,6 +1,6 @@
 [org.cinnamon]
 desktop-effects-minimize-effect="traditional"
-favorite-apps=['firefox.desktop', 'org.mageia.dnfdragora.desktop', 'cinnamon-settings.desktop', 'com.gexperts.Tilix.desktop', 'nemo.desktop']
+favorite-apps=['firefox.desktop', 'org.mageia.dnfdragora.desktop', 'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop']
 number-workspaces=4
 startup-animation=true
 workspace-expo-view-as-grid=true
@@ -77,6 +77,3 @@ three-finger-click=0
 
 [org.cinnamon.theme]
 name="Arc-Dark"
-
-[com.gexperts.Tilix.Settings]
-window-style="disable-csd-hide-toolbar"
diff --git a/cinnamon-fedora-28.gschema.override b/cinnamon-fedora-28.gschema.override
index b974561..d0c62f3 100644
--- a/cinnamon-fedora-28.gschema.override
+++ b/cinnamon-fedora-28.gschema.override
@@ -1,6 +1,6 @@
 [org.cinnamon]
 desktop-effects-minimize-effect="traditional"
-favorite-apps=['firefox.desktop', 'org.mageia.dnfdragora.desktop', 'cinnamon-settings.desktop', 'com.gexperts.Tilix.desktop', 'nemo.desktop']
+favorite-apps=['firefox.desktop', 'org.mageia.dnfdragora.desktop', 'cinnamon-settings.desktop', 'org.gnome.Terminal.desktop', 'nemo.desktop']
 number-workspaces=4
 startup-animation=true
 workspace-expo-view-as-grid=true
@@ -77,6 +77,3 @@ three-finger-click=0
 
 [org.cinnamon.theme]
 name="Arc-Dark"
-
-[com.gexperts.Tilix.Settings]
-window-style="disable-csd-hide-toolbar"
diff --git a/cinnamon-rhel-7.gschema.override b/cinnamon-rhel-7.gschema.override
index 4e0e972..a8fc095 100644
--- a/cinnamon-rhel-7.gschema.override
+++ b/cinnamon-rhel-7.gschema.override
@@ -77,6 +77,3 @@ three-finger-click=0
 
 [org.cinnamon.theme]
 name="Arc-Dark"
-
-[com.gexperts.Tilix.Settings]
-window-style="disable-csd-hide-toolbar"
diff --git a/cinnamon.spec b/cinnamon.spec
index da7902b..b268c82 100644
--- a/cinnamon.spec
+++ b/cinnamon.spec
@@ -9,7 +9,7 @@
 
 Name:           cinnamon
 Version:        3.6.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Window management and application launching for GNOME
 License:        GPLv2+ and LGPLv2+
 URL:            https://github.com/linuxmint/%{name}
@@ -34,11 +34,7 @@ Patch2:         cinnamon-settings-apps-rhel-7.patch
 %endif # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8
 Patch3:         set_wheel.patch
 Patch4:         revert_25aef37.patch
-%if 0%{?fedora} >= 27 || 0%{?rhel} >= 8
-Patch5:         default_panal_launcher_tilix.patch
-%else
 Patch5:         default_panal_launcher.patch
-%endif
 Patch6:         remove_crap_from_menu.patch
 Patch7:         replace-metacity-with-openbox.patch
 Patch8:         menu-use-fedora-icon-as-default.patch
@@ -298,6 +294,9 @@ fi
 %doc %{_datadir}/gtk-doc/html/*/
 
 %changelog
+* Tue Nov 21 2017 Björn Esser <besser82@fedoraproject.org> - 3.6.5-2
+- Revert from Tilix to Gnome Terminal
+
 * Mon Nov 20 2017 Björn Esser <besser82@fedoraproject.org> - 3.6.5-1
 - update to 3.6.5 release
 
@@ -1136,4 +1135,3 @@ fi
 
 * Sat Jun 01 2013 Leigh Scott <leigh123linux@googlemail.com> - 1.8.7-2
 - Re-add build requires versions
-
diff --git a/default_panal_launcher_tilix.patch b/default_panal_launcher_tilix.patch
deleted file mode 100644
index 2e8f0d9..0000000
--- a/default_panal_launcher_tilix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
-+++ b/files/usr/share/cinnamon/applets/panel-launchers@cinnamon.org/settings-schema.json
-@@ -5,7 +5,7 @@
-     },
-     "launcherList": {
-         "type": "generic",
--        "default": ["firefox.desktop", "gnome-terminal.desktop", "nemo.desktop"]
-+        "default": ["firefox.desktop", "mozilla-thunderbird.desktop", "com.gexperts.Tilix.desktop", "nemo.desktop"]
-     },
-     "allow-dragging": {
-         "type": "switch",
-