[mate-panel/f21] update marco wm name, fix rhbz (#1007219)

[Wolfgang Ulbrich]

commit 706f0c53cfc75931384246e7c19284c627359f41
Author: raveit65 <chat-to-me at raveit.de>
Date:   Mon Dec 1 14:39:05 2014 +0100

    update marco wm name, fix rhbz (#1007219)

 mate-panel.spec                       |   14 +++++++++++---
 mate-panel_update-marco-wm-name.patch |   24 ++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 3 deletions(-)
---
diff --git a/mate-panel.spec b/mate-panel.spec
index ef9037f..21a0771 100644
--- a/mate-panel.spec
+++ b/mate-panel.spec
@@ -14,7 +14,7 @@
 
 Name:           mate-panel
 Version:        %{branch}.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 #Release:        0.1%{?git_rel}%{?dist}
 Summary:        MATE Desktop panel and applets
 #libs are LGPLv2+ applications GPLv2+
@@ -34,6 +34,9 @@ Patch0:         mate-panel_container-child-background.patch
 Patch1:         mate-panel_fix-container_child_background_set.patch
 # https://github.com/mate-desktop/mate-panel/pull/261
 Patch2:         mate-panel_timezone.patch
+# rhbz (#1169330)
+# http://git.mate-desktop.org/mate-panel/commit/?h=1.8&id=45f9dd1
+Patch3:         mate-panel_update-marco-wm-name.patch
 
 Requires:       %{name}-libs%{?_isa} = %{version}-%{release}
 # needed as nothing else requires it
@@ -83,6 +86,7 @@ Development files for mate-panel
 %patch0 -p1 -b .container
 %patch1 -p1 -b .container2
 %patch2 -p1 -b .timezone
+%patch3 -p1 -b .marco-wm-name
 
 # To work around rpath
 #autoreconf -fi
@@ -177,8 +181,12 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
-* Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
--fix rhbz (#1023604)
+* Mon Dec 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-3
+- fix rhbz (#1007219)
+- update marco wm name
+
+* Fri Nov 28 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-2
+- fix rhbz (#1023604)
 - timezone fix
 
 * Wed Oct 01 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.1-1
diff --git a/mate-panel_update-marco-wm-name.patch b/mate-panel_update-marco-wm-name.patch
new file mode 100644
index 0000000..784f6de
--- /dev/null
+++ b/mate-panel_update-marco-wm-name.patch
@@ -0,0 +1,24 @@
+From 45f9dd1209ea5715b02d5d1a5e9e2dd51220da1e Mon Sep 17 00:00:00 2001
+From: Nathan Torchia <nemasu at gmail.com>
+Date: Fri, 03 Oct 2014 01:24:21 +0000
+Subject: Update Marco WM name as per Marco commit
+
+Closes https://github.com/mate-desktop/mate-panel/pull/240
+
+ cbf24f5d78719b930fc0cd6c0c80e00e9d62c95a
+---
+diff --git a/applets/wncklet/workspace-switcher.c b/applets/wncklet/workspace-switcher.c
+index d35155a..6de086b 100644
+--- a/applets/wncklet/workspace-switcher.c
++++ b/applets/wncklet/workspace-switcher.c
+@@ -143,7 +143,7 @@ static void window_manager_changed(WnckScreen* screen, PagerData* pager)
+ 
+ 	if (!wm_name)
+ 		pager->wm = PAGER_WM_UNKNOWN;
+-	else if (strcmp(wm_name, "Marco") == 0)
++	else if (strcmp(wm_name, "Metacity (Marco)") == 0)
+ 		pager->wm = PAGER_WM_MARCO;
+ 	else if (strcmp(wm_name, "Compiz") == 0)
+ 		pager->wm = PAGER_WM_COMPIZ;
+--
+cgit