diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 15fcdfc..768427a 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.2%{?git_rel}%{?dist} %endif @@ -51,7 +51,7 @@ Requires: mate-control-center-filesystem # 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-synaptics-legacy Requires: xorg-x11-drv-evdev %endif @@ -114,7 +114,6 @@ if [ $1 -eq 0 ] ; then /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 @@ -124,7 +123,6 @@ fi /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 @@ -137,7 +135,6 @@ mkdir -p %{_sysconfdir}/X11/xorg.conf.d/ %{_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 @@ -160,6 +157,12 @@ mkdir -p %{_sysconfdir}/X11/xorg.conf.d/ %changelog +* Fri Dec 23 2016 Wolfgang Ulbrich - 1.17.0-2 +- update to 1.17.0 release +- remove priority synaptic symlink for f26 +- use requires xorg-x11-drv-synaptics-legacy for f26 +- fix rhbz (#1406948) + * Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.0-1 - update to 1.17.0 release - add priority symlinks for synaptics and evdev driver