diff --git a/cinnamon.spec b/cinnamon.spec index cb66b37..d106cd2 100644 --- a/cinnamon.spec +++ b/cinnamon.spec @@ -6,7 +6,7 @@ Name: cinnamon Version: 3.2.3 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Window management and application launching for GNOME License: GPLv2+ and LGPLv2+ URL: http://cinnamon.linuxmint.com @@ -25,6 +25,7 @@ Patch4: network-user-connections.patch Patch5: revert_25aef37.patch Patch6: default_panal_launcher.patch Patch7: remove_crap_from_menu.patch +Patch8: replace-metacity-with-openbox.patch %global clutter_version 1.12.2 %global cjs_version 3.2.0 @@ -115,19 +116,15 @@ Requires: zukitwo-gtk2-theme Requires: zukitwo-gtk3-theme Requires: zukitwo-metacity-theme %endif -%if 0%{?fedora} >= 25 -Requires: mate-panel -%else Requires: tint2 -%endif Requires: cinnamon-control-center Requires: cinnamon-translations # RequiredComponents in the session files Requires: nemo Requires: cinnamon-screensaver -# metacity is needed for fallback -Requires: metacity +# openbox is needed for fallback +Requires: openbox # required for keyboard applet Requires: gucharmap @@ -262,6 +259,12 @@ fi %doc %{_datadir}/gtk-doc/html/*/ %changelog +* Sat Dec 10 2016 leigh scott - 3.2.3-2 +- tweak fallback session +- drop mate-panel as tint2 seems a better fit +- replace metacity with openbox as it does + window decoration and a simple menu + * Sat Dec 10 2016 leigh scott - 3.2.3-1 - update to 3.2.3 release diff --git a/replace-metacity-with-openbox.patch b/replace-metacity-with-openbox.patch new file mode 100644 index 0000000..f2cb576 --- /dev/null +++ b/replace-metacity-with-openbox.patch @@ -0,0 +1,25 @@ +From d352f39d9342b019958206cfa8e0b59da3b09434 Mon Sep 17 00:00:00 2001 +From: leigh123linux +Date: Sat, 10 Dec 2016 19:20:21 +0000 +Subject: [PATCH] replace metacity with openbox + +--- + files/usr/bin/cinnamon-launcher | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/files/usr/bin/cinnamon-launcher b/files/usr/bin/cinnamon-launcher +index 8ef6d80..6ec4e7d 100755 +--- a/files/usr/bin/cinnamon-launcher ++++ b/files/usr/bin/cinnamon-launcher +@@ -3,7 +3,7 @@ + """ Launches or restarts cinnamon + """ + +-FALLBACK_COMMAND = "metacity" ++FALLBACK_COMMAND = "openbox" + FALLBACK_ARGS = ("--replace",) + + import os +-- +2.9.3 +