[mate-settings-daemon/epel7] fix xrdb plugin (#1140329)

[Wolfgang Ulbrich]

commit 9ae307516caaaf92dc602e91072d3c94846c4142
Author: raveit65 <chat-to-me at raveit.de>
Date:   Wed Nov 12 23:45:14 2014 +0100

    fix xrdb plugin (#1140329)

 mate-settings-daemon.spec                          |   12 ++++++++++--
 ...-settings-daemon_fix-xrdb-plugin-for-rhel.patch |   12 ++++++++++++
 2 files changed, 22 insertions(+), 2 deletions(-)
---
diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec
index d2c7343..b0eea9e 100644
--- a/mate-settings-daemon.spec
+++ b/mate-settings-daemon.spec
@@ -1,12 +1,15 @@
 Name:           mate-settings-daemon
 Version:        1.8.2
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        MATE Desktop settings daemon
 License:        GPLv2+
 URL:            http://mate-desktop.org
 
 Source0:        http://pub.mate-desktop.org/releases/1.8/%{name}-%{version}.tar.xz
 
+# fix rhbz (#1140329)
+Patch0:         mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
+
 # To generate tarball
 # wget http://git.mate-desktop.org/%%{name}/snapshot/%%{name}-{_internal_version}.tar.xz -O %%{name}-%%{version}.git%%{_internal_version}.tar.xz
 #Source0: http://raveit65.fedorapeople.org/Mate/git-upstream/%{name}-%{version}.git%{_internal_version}.tar.xz
@@ -45,7 +48,9 @@ various parameters of a MATE session and the applications that run
 under it.
 
 %prep
-%setup -q 
+%setup -q
+
+%patch0 -p1 -b .xrdb
 
 %build
 %configure                             \
@@ -112,6 +117,9 @@ fi
 
 
 %changelog
+* Wed Nov 12 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-2
+- fix xrdb plugin (#1140329)
+
 * Thu Oct 02 2014 Wolfgang Ulbrich <chat-to-me at raveit.de> - 1.8.2-1
 - update to 1.8.2 release
 
diff --git a/mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch b/mate-settings-daemon_fix-xrdb-plugin-for-rhel.patch
new file mode 100644
index 0000000..1cefe14
--- /dev/null
+++ b/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);