From 704113a3d4e66ad416706f1eff66fc75d1ddd301 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= <arekm@maven.pl>
Date: Wed, 1 Sep 2010 05:40:59 +0000
Subject: [PATCH] - up to 1.3.0

Changed files:
    10-synaptics.conf -> 1.2
    xorg-driver-input-synaptics.spec -> 1.25
---
 10-synaptics.conf                |  6 ------
 xorg-driver-input-synaptics.spec | 16 +++++-----------
 2 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 10-synaptics.conf

diff --git a/10-synaptics.conf b/10-synaptics.conf
deleted file mode 100644
index 29818e8..0000000
--- a/10-synaptics.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-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 e5c8261..c712df8 100644
--- a/xorg-driver-input-synaptics.spec
+++ b/xorg-driver-input-synaptics.spec
@@ -1,13 +1,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:	5
+Version:	1.3.0
+Release:	1
 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
+# Source0-md5:	b4e58eba1bdca13f0929a4b03b262135
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
@@ -55,14 +54,10 @@ Plik nagłówkowy sterownika synaptics.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{/etc/X11/xorg.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/xorg.conf.d/10-synaptics.conf
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/*.la
 
 %clean
@@ -70,12 +65,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README TODO
+%doc COPYING ChangeLog README
 %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/xorg.conf.d/10-synaptics.conf
-%{_datadir}/hal/fdi/policy/10osvendor/11-x11-synaptics.fdi
+%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 %{_mandir}/man1/synclient.1*
 %{_mandir}/man1/syndaemon.1*
 %{_mandir}/man4/synaptics.4*
-- 
2.44.0