add patch to fix xrdb plugin for rhel7 build

mate-settings-daemon.spec

@@ -15,7 +15,7 @@
 Name:           mate-settings-daemon
 Version:        %{branch}.1
 %if 0%{?rel_build}
-Release:        1%{?dist}
+Release:        2%{?dist}
 %else
 Release:        0.3%{?git_rel}%{?dist}
 %endif
@@ -29,6 +29,9 @@ URL:            http://mate-desktop.org
 # Source for snapshot-builds.
 %{!?rel_build:Source0:    http://git.mate-desktop.org/%{name}/snapshot/%{name}-%{commit}.tar.xz#/%{git_tar}}
 
+# fix rhbz (#1140329)
+Patch0:         mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  dconf-devel
 BuildRequires:  desktop-file-utils
@@ -66,6 +69,10 @@ under it.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
+%if 0%{?rhel}
+%patch0 -p1 -b .xrdb
+%endif
+
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
 %else # 0%{?rel_build}
@@ -141,6 +148,9 @@ fi
 
 
 %changelog
+* Wed May 03 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.1-2
+- add patch to fix xrdb plugin for rhel7 build
+
 * Wed Apr 05 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.18.1-1
 - update to 1.18.1
 

mate-settings-daemon_0001-Make-pointer-locater-always-pass-through.patch

@@ -1,25 +0,0 @@
-From 280c1746b557369793e41f39e1d6b5edb1a1bf2b Mon Sep 17 00:00:00 2001
-From: Alexei Sorokin <sor.alexei@meowr.ru>
-Date: Tue, 14 Mar 2017 15:58:27 +0300
-Subject: [PATCH] Make pointer locater always pass through
-
----
- plugins/mouse/msd-locate-pointer.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/mouse/msd-locate-pointer.c b/plugins/mouse/msd-locate-pointer.c
-index e114fd0..4cddd97 100644
---- a/plugins/mouse/msd-locate-pointer.c
-+++ b/plugins/mouse/msd-locate-pointer.c
-@@ -417,7 +417,7 @@ move_locate_pointer_window (MsdLocatePointerData *data,
-                                                   0);
-   cr = cairo_create (mask);
- 
--  cairo_set_source_rgb (cr, 0., 0., 0.);
-+  cairo_set_source_rgba (cr, 0., 0., 0., 0.);
-   cairo_rectangle (cr, 0., 0., WINDOW_SIZE, WINDOW_SIZE);
-   cairo_fill (cr);
- 
--- 
-2.12.0
-

mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch

@@ -0,0 +1,12 @@
+diff -upr mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c
+--- mate-settings-daemon-make-dist-orig/plugins/xrdb/msd-xrdb-manager.c	2014-11-12 23:17:45.461271000 +0100
++++ mate-settings-daemon-make-dist/plugins/xrdb/msd-xrdb-manager.c	2014-11-12 23:18:28.705704971 +0100
+@@ -430,7 +430,7 @@ apply_settings (MsdXrdbManager *manager,
+ 
+         mate_settings_profile_start (NULL);
+ 
+-        command = "xrdb -merge -quiet";
++        command = "xrdb -cpp /bin/cpp -merge -quiet";
+ 
+         string = g_string_sized_new (256);
+         append_theme_colors (style, string);