- rel 2; add 10-synaptics.conf for new xserver

Changed files:
    10-synaptics.conf -> 1.1
    xorg-driver-input-synaptics.spec -> 1.20

diff --git a/10-synaptics.conf b/10-synaptics.conf
new file mode 100644 (file)
index 0000000..29818e8
--- /dev/null
+++ b/10-synaptics.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+        Identifier "touchpad catchall"
+        Driver "synaptics"
+        MatchIsTouchpad "on"
+        MatchDevicePath "/dev/input/event*"
+EndSection

diff --git a/xorg-driver-input-synaptics.spec b/xorg-driver-input-synaptics.spec
index 8011354245e063b1dfb3b3f7db7b0fa11849140c..0b255c0de9f7e9ef93a3991ce4a772a0d5836c9e 100644 (file)
--- a/xorg-driver-input-synaptics.spec
+++ b/xorg-driver-input-synaptics.spec
@@ -2,11 +2,12 @@ Summary:      X.org input driver for Synaptics and ALPS touchpads
 Summary(pl.UTF-8):     Sterownik wejściowy X.org do touchpadów Synaptics oraz ALPS
 Name:          xorg-driver-input-synaptics
 Version:       1.2.2
-Release:       1
+Release:       2
 License:       MIT
 Group:         X11/Applications
 Source0:       http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-%{version}.tar.bz2
 # Source0-md5: d8842f762bf3f20098c529136dac578c
+Source1:       10-synaptics.conf
 URL:           http://xorg.freedesktop.org/
 BuildRequires: perl-base
 BuildRequires: pkgconfig
@@ -50,12 +51,13 @@ Plik nagłówkowy sterownika synaptics.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
+install -d $RPM_BUILD_ROOT{/etc/X11/conf.d,%{_datadir}/hal/fdi/policy/10osvendor}
 
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT
 
 install fdi/11-x11-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
+install %{SOURCE1} $RPM_BUILD_ROOT/etc/X11/conf.d/10-synaptics.conf
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/*.la
 
@@ -68,6 +70,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/synclient
 %attr(755,root,root) %{_bindir}/syndaemon
 %attr(755,root,root) %{_libdir}/xorg/modules/input/synaptics_drv.so
+%config(noreplace) %verify(not md5 mtime size) /etc/X11/conf.d/10-synaptics.conf
 %{_datadir}/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
 %{_mandir}/man1/synclient.1*
 %{_mandir}/man1/syndaemon.1*