- rel 2; use upstream 10-evdev.conf

diff --git a/evdev.conf b/evdev.conf
deleted file mode 100644 (file)
index cc2b83f..0000000
--- a/evdev.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Section "InputClass"
-       Identifier "Keyboard Defaults"
-       MatchIsKeyboard "yes"
-# https://wiki.archlinux.org/index.php/Xorg#Ctrl.2BAlt.2BBackspace_does_not_work
-#      Option "XkbOptions" "terminate:ctrl_alt_bksp"
-EndSection

diff --git a/xorg-driver-input-evdev.spec b/xorg-driver-input-evdev.spec
index 2eb8d74bbb8a03e180343abc53a41a93c767e157..bbec0e043f7ac450fd51bc0968c6eaccd6ea23a4 100644 (file)
--- a/xorg-driver-input-evdev.spec
+++ b/xorg-driver-input-evdev.spec
@@ -2,12 +2,11 @@ Summary:      X.org input driver for Linux generic event devices
 Summary(pl.UTF-8):     Sterownik wejściowy X.org dla ogólnych urządzeń linuksowych generujących zdarzenia
 Name:          xorg-driver-input-evdev
 Version:       2.10.0
-Release:       1
+Release:       2
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-%{version}.tar.bz2
 # Source0-md5: b1183c55125981d346102d1be704760b
-Source1:       evdev.conf
 URL:           http://xorg.freedesktop.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -66,9 +65,6 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT/etc/X11/xorg.conf.d
-cp -p %{SOURCE1}  $RPM_BUILD_ROOT/etc/X11/xorg.conf.d/10-evdev.conf
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/*/*.la
 
 %clean
@@ -77,10 +73,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README
-%config(noreplace) %verify(not md5 mtime size) /etc/X11/xorg.conf.d/10-evdev.conf
 %attr(755,root,root) %{_libdir}/xorg/modules/input/evdev_drv.so
-# currently in xorg-server (as of 1.17.4); enable after removing from server
-#%{_datadir}/X11/xorg.conf.d/10-evdev.conf
+%{_datadir}/X11/xorg.conf.d/10-evdev.conf
 %{_mandir}/man4/evdev.4*
 
 %files devel