From 7cc915ab4bfcef0ed2fde87d3a1c06805276b059 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sep 05 2016 01:44:53 +0000 Subject: Move the synaptics override to /etc/ (related #1338585) --- diff --git a/mate-desktop.spec b/mate-desktop.spec index 2190382..bead753 100644 --- a/mate-desktop.spec +++ b/mate-desktop.spec @@ -17,7 +17,7 @@ Name: mate-desktop License: GPLv2+ and LGPLv2+ and MIT Version: %{branch}.1 %if 0%{?rel_build} -Release: 3%{?dist} +Release: 4%{?dist} %else Release: 0.2%{?git_rel}%{?dist} %endif @@ -219,14 +219,15 @@ if [ $1 -eq 0 ] ; then /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || : fi %if 0%{?fedora} -/usr/bin/rm -f %{_datadir}/X11/xorg.conf.d/99-synaptics-mate.conf +/usr/bin/rm -f %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf %endif %posttrans /usr/bin/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : /usr/bin/gtk-update-icon-cache -f %{_datadir}/icons/hicolor &> /dev/null || : %if 0%{?fedora} -/usr/bin/ln -sf %{_datadir}/X11/xorg.conf.d/50-synaptics.conf %{_datadir}/X11/xorg.conf.d/99-synaptics-mate.conf &> /dev/null || : +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 || : %endif @@ -249,7 +250,7 @@ fi %{_datadir}/icons/hicolor/scalable/apps/mate-symbolic.svg %{_datadir}/icons/hicolor/scalable/apps/mate.svg %if 0%{?fedora} -%ghost %{_datadir}/X11/xorg.conf.d/99-synaptics-mate.conf +%ghost %{_sysconfdir}/X11/xorg.conf.d/99-synaptics-mate.conf %endif %{_mandir}/man1/* @@ -267,6 +268,9 @@ fi %changelog +* Fri Sep 02 2016 Peter Hutterer 1.15.1-4 +- Move the synaptics override to /etc/ (related #1338585) + * Thu Aug 11 2016 Wolfgang Ulbrich - 1.15.1-3 - set a priority for the gsettings override file