From e05de66178a9178ea75aabdcf706cc69ba1217bf Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 10 Dec 2016 22:22:54 +0100 Subject: [PATCH] add priority symlinks for synaptics and evdev driver --- mate-settings-daemon.spec | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 2be0d73..914154d 100644 --- a/mate-settings-daemon.spec +++ b/mate-settings-daemon.spec @@ -15,7 +15,7 @@ Name: mate-settings-daemon Version: %{branch}.0 %if 0%{?rel_build} -Release: 1%{?dist} +Release: 2%{?dist} %else Release: 0.1%{?git_rel}%{?dist} %endif @@ -54,6 +54,12 @@ Requires: libmatekbd%{?_isa} >= 0:1.6.1-1 # needed for xrdb fix Requires: cpp +# 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 + %description This package contains the daemon which is responsible for setting the various parameters of a MATE session and the applications that run @@ -115,11 +121,20 @@ 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 @@ -129,6 +144,10 @@ fi %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 @@ -149,6 +168,9 @@ fi %changelog +* Sat Dec 10 2016 Wolfgang Ulbrich - 1.16.0-2 +- add priority symlinks for synaptics and evdev driver + * Sun Oct 02 2016 Wolfgang Ulbrich - 1.16.0-1 - update to 1.16.0 release