update to 1.18.1

.gitignore

@@ -33,3 +33,4 @@
 /mate-settings-daemon-1.16.0.tar.xz
 /mate-settings-daemon-1.16.1.tar.xz
 /mate-settings-daemon-1.16.2.tar.xz
+/mate-settings-daemon-1.18.1.tar.xz

mate-settings-daemon.spec

@@ -2,7 +2,7 @@
 %global rel_build 1
 
 # This is needed, because src-url contains branched part of versioning-scheme.
-%global branch 1.16
+%global branch 1.18
 
 # Settings used for build from snapshots.
 %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921}
@@ -13,7 +13,7 @@
 %{!?rel_build:%global git_tar %{name}-%{version}-%{git_ver}.tar.xz}
 
 Name:           mate-settings-daemon
-Version:        %{branch}.2
+Version:        %{branch}.1
 %if 0%{?rel_build}
 Release:        1%{?dist}
 %else
@@ -29,6 +29,10 @@ 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
+Patch1:         mate-settings-daemon_0001-ldsm-dialog-set-max-width-chars-for-labels.patch
+
 BuildRequires:  dbus-glib-devel
 BuildRequires:  dconf-devel
 BuildRequires:  desktop-file-utils
@@ -49,14 +53,6 @@ Requires:       libmatekbd%{?_isa} >= 0:1.6.1-1
 # needed for xrandr capplet
 Requires:       mate-control-center-filesystem
 
-%ifnarch s390 s390x
-# to be sure that mouse and touchpad settings are working with correct drivers
-%if 0%{?fedora}
-Requires: xorg-x11-drv-synaptics
-Requires: xorg-x11-drv-evdev
-%endif
-%endif
-
 %description
 This package contains the daemon which is responsible for setting the
 various parameters of a MATE session and the applications that run
@@ -74,6 +70,12 @@ under it.
 %prep
 %setup -q%{!?rel_build:n %{name}-%{commit}}
 
+%if 0%{?rhel}
+%patch0 -p1 -b .xrdb
+%endif
+
+%patch1 -p1 -b .0001
+
 %if 0%{?rel_build}
 #NOCONFIGURE=1 ./autogen.sh
 %else # 0%{?rel_build}
@@ -89,8 +91,7 @@ NOCONFIGURE=1 ./autogen.sh
    --disable-schemas-compile           \
    --enable-polkit                     \
    --with-x                            \
-   --with-nssdb                        \
+   --with-nssdb
-   --with-gtk=3.0
 
 make %{?_smp_mflags} V=1
 
@@ -116,20 +117,11 @@ if [ $1 -eq 0 ] ; then
     /usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
     /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 fi
-%if 0%{?fedora}
-/usr/bin/rm -f %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf
-/usr/bin/rm -f %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf
-%endif
 
 %posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/mate &> /dev/null || :
 /usr/bin/gtk-update-icon-cache %{_datadir}/hicolor/mate &> /dev/null || :
 /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
-%if 0%{?fedora}
-mkdir -p %{_sysconfdir}/X11/xorg.conf.d/
-/usr/bin/ln -sf %{_datadir}/X11/xorg.conf.d/50-synaptics.conf %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf &> /dev/null || :
-/usr/bin/ln -sf %{_datadir}/X11/xorg.conf.d/10-evdev.conf %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf &> /dev/null || :
-%endif
 
 
 %files -f %{name}.lang
@@ -139,10 +131,6 @@ mkdir -p %{_sysconfdir}/X11/xorg.conf.d/
 %config %{_sysconfdir}/dbus-1/system.d/org.mate.SettingsDaemon.DateTimeMechanism.conf
 %{_sysconfdir}/xdg/autostart/mate-settings-daemon.desktop
 %{_sysconfdir}/xrdb/
-%if 0%{?fedora}
-%ghost %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf
-%ghost %{_sysconfdir}/X11/xorg.conf.d/99-mate-evdev.conf
-%endif
 %{_libdir}/mate-settings-daemon
 %{_libexecdir}/mate-settings-daemon
 %{_libexecdir}/msd-datetime-mechanism
@@ -163,6 +151,9 @@ mkdir -p %{_sysconfdir}/X11/xorg.conf.d/
 
 
 %changelog
+* Sat Jun 17 2017 Wolfgang Ulbrich <fedora@raveit.de> - 1.18.1-1
+- update to 1.18.1 release
+
 * Sun Mar 26 2017 Wolfgang Ulbrich <chat-to-me@raveit.de> - 1.16.2-1
 - update to 1.16.2 release
 - fixes rhbz (#1420709, #1383272)

mate-settings-daemon_0001-ldsm-dialog-set-max-width-chars-for-labels.patch

@@ -0,0 +1,33 @@
+From e4e8236cc8605f03284444b5c63c234740cde0d3 Mon Sep 17 00:00:00 2001
+From: raveit65 <mate@raveit.de>
+Date: Tue, 25 Apr 2017 22:19:06 +0200
+Subject: [PATCH 1/2] ldsm-dialog: set max width chars for labels
+
+This reduce the width of the dialog
+---
+ plugins/housekeeping/msd-ldsm-dialog.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/plugins/housekeeping/msd-ldsm-dialog.c b/plugins/housekeeping/msd-ldsm-dialog.c
+index 190daf4..ec72ebd 100644
+--- a/plugins/housekeeping/msd-ldsm-dialog.c
++++ b/plugins/housekeeping/msd-ldsm-dialog.c
+@@ -222,6 +222,7 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog)
+         dialog->priv->primary_label = gtk_label_new (NULL);	
+         gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->primary_label), TRUE);
+         gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->primary_label), FALSE);
++        gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->primary_label), 70);
+ #if GTK_CHECK_VERSION (3, 16, 0)
+         gtk_label_set_xalign (GTK_LABEL (dialog->priv->primary_label), 0.0);
+         gtk_label_set_yalign (GTK_LABEL (dialog->priv->primary_label), 0.0);
+@@ -232,6 +233,7 @@ msd_ldsm_dialog_init (MsdLdsmDialog *dialog)
+         dialog->priv->secondary_label = gtk_label_new (NULL);
+         gtk_label_set_line_wrap (GTK_LABEL (dialog->priv->secondary_label), TRUE);
+         gtk_label_set_single_line_mode (GTK_LABEL (dialog->priv->secondary_label), FALSE);
++        gtk_label_set_max_width_chars (GTK_LABEL (dialog->priv->secondary_label), 70);
+ #if GTK_CHECK_VERSION (3, 16, 0)
+         gtk_label_set_xalign (GTK_LABEL (dialog->priv->secondary_label), 0.0);
+         gtk_label_set_yalign (GTK_LABEL (dialog->priv->secondary_label), 0.0);
+-- 
+2.12.2
+

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);

sources

@@ -1 +1 @@
-SHA512 (mate-settings-daemon-1.16.2.tar.xz) = e4b527791f65c500ac0b432744c3b128a6a438077261ee182993c82c175d165c2f67fa60620ac03c6f6f532ef6cb4a2a6df52164022a30015e7a071a03df043e
+SHA512 (mate-settings-daemon-1.18.1.tar.xz) = 35ea953a508c1a8a2359a13f36789f2b171873e2b153f3c7e5e779a900672cf19a4f36892136d4886e61349f536706f0ab0e781cbde3e246c490c66af3e621d6