From 5eff807fa9cee262f5ef1a3008d4e8c72c624917 Mon Sep 17 00:00:00 2001 From: raveit65 Date: Sat, 3 Dec 2016 21:32:08 +0100 Subject: [PATCH] update to 1.17.0 --- .gitignore | 1 + mate-settings-daemon.spec | 28 +++++++++++++++++++++++++--- sources | 2 +- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 067a37c..3c03f65 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /mate-settings-daemon-1.15.0.tar.xz /mate-settings-daemon-1.15.1.tar.xz /mate-settings-daemon-1.16.0.tar.xz +/mate-settings-daemon-1.17.0.tar.xz diff --git a/mate-settings-daemon.spec b/mate-settings-daemon.spec index 3b2ebe7..21e1df7 100644 --- a/mate-settings-daemon.spec +++ b/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.17 # Settings used for build from snapshots. %{!?rel_build:%global commit 83fe1f587f5c6328b10a899a880275d79bf88921} @@ -49,6 +49,12 @@ Requires: libmatekbd%{?_isa} >= 0:1.6.1-1 # needed for xrandr capplet 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-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 @@ -81,8 +87,7 @@ NOCONFIGURE=1 ./autogen.sh --disable-schemas-compile \ --enable-polkit \ --with-x \ - --with-nssdb \ - --with-gtk=3.0 + --with-nssdb make %{?_smp_mflags} V=1 @@ -108,11 +113,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 @@ -122,6 +136,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 @@ -142,6 +160,10 @@ fi %changelog +* Sat Dec 03 2016 Wolfgang Ulbrich - 1.17.0-1 +- update to 1.17.0 release +- add priority symlinks for synaptics and evdev driver + * Sat Sep 17 2016 Wolfgang Ulbrich - 1.16.0-1 - test 1.16.0 release diff --git a/sources b/sources index 4a036a7..f5ff677 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4e1fa442b5980cb9723006deea165947 mate-settings-daemon-1.16.0.tar.xz +8c04b769371298ad5cbfbd26b749c199 mate-settings-daemon-1.17.0.tar.xz