diff --git a/xorg-x11-drv-libinput.spec b/xorg-x11-drv-libinput.spec index 63efc99..5b3faa9 100644 --- a/xorg-x11-drv-libinput.spec +++ b/xorg-x11-drv-libinput.spec @@ -8,7 +8,7 @@ Summary: Xorg X11 libinput input driver Name: xorg-x11-drv-libinput Version: 0.22.0 -Release: 2%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} +Release: 3%{?gitdate:.%{gitdate}git%{gitversion}}%{?dist} URL: http://www.x.org License: MIT @@ -32,6 +32,9 @@ Requires: Xorg %(xserver-sdk-abi-requires xinput) Requires: xkeyboard-config Requires: libinput >= 0.21.0 +Provides: xorg-x11-drv-synaptics = 1.9.0-3 +Obsoletes: xorg-x11-drv-synaptics < 1.9.0-3 + %description A generic input driver for the X.Org X11 X server based on libinput, supporting all devices. @@ -52,15 +55,10 @@ make %{?_smp_mflags} # should be fixed in upstream Makefile.am or whatever. find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f -- -# Keep libinput.conf at priority 60 for now, until we've obsoleted -# synaptics -mv $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/40-libinput.conf \ - $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/60-libinput.conf - %files %doc COPYING %{driverdir}/libinput_drv.so -%{_datadir}/X11/xorg.conf.d/60-libinput.conf +%{_datadir}/X11/xorg.conf.d/40-libinput.conf %{_mandir}/man4/libinput.4* %package devel @@ -76,6 +74,11 @@ Xorg X11 libinput input driver development files. %{_includedir}/xorg/libinput-properties.h %changelog +* Fri Nov 18 2016 Peter Hutterer 0.22.0-3 +- Provide xorg-x11-drv-synaptics. The actual content is now provided by + xorg-x11-drv-synaptics-legacy (#1394836). For details, see + https://fedoraproject.org/wiki/Changes/RetireSynapticsDriver + * Tue Nov 01 2016 Peter Hutterer 0.22.0-2 - Match against tablets too