X-Git-Url: https://git.pld-linux.org/?p=packages%2Fxorg-driver-input-synaptics.git;a=blobdiff_plain;f=xorg-driver-input-synaptics.spec;h=e15dc01fa2c082c300e280a3557a5e2983fb7d82;hp=eae3cbd536cb4a2d3aa00f9877891b035c9c297e;hb=HEAD;hpb=f9511e53eb7864c011f262a051ae9743798b9e8d

diff --git a/xorg-driver-input-synaptics.spec b/xorg-driver-input-synaptics.spec
index eae3cbd..e15dc01 100644
--- a/xorg-driver-input-synaptics.spec
+++ b/xorg-driver-input-synaptics.spec
@@ -1,27 +1,41 @@
 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:	3
+Version:	1.9.2
+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
-URL:		http://xorg.freedesktop.org/
+Source0:	https://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-%{version}.tar.xz
+# Source0-md5:	3b95e7baf4428b114e9910f999e96601
+Patch0:		restore-shm1.patch
+Patch1:		restore-shm2.patch
+Patch2:		more-fingers.patch
+URL:		https://xorg.freedesktop.org/
+BuildRequires:	autoconf >= 2.60
+BuildRequires:	automake
+BuildRequires:	libevdev-devel >= 1.2
+BuildRequires:	libtool
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.389
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libXi-devel
-BuildRequires:	xorg-lib-libpciaccess-devel
-BuildRequires:	xorg-xserver-server-devel
-%requires_xorg_xserver_xinput
-Obsoletes:	X11-input-synaptics
-Obsoletes:	X11-synaptics
-Obsoletes:	XFree86-input-synaptics
-Obsoletes:	xorg-app-synaptics
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xorg-lib-libXi-devel >= 1.2
+BuildRequires:	xorg-lib-libXtst-devel >= 1.0.99.1
+BuildRequires:	xorg-proto-inputproto-devel >= 2.1.99.3
+BuildRequires:	xorg-proto-randrproto-devel
+BuildRequires:	xorg-proto-recordproto-devel
+BuildRequires:	xorg-proto-xproto-devel
+BuildRequires:	xorg-util-util-macros >= 1.13
+BuildRequires:	xorg-xserver-server-devel >= 1.12
+BuildRequires:	xz
+Requires:	xorg-lib-libXi >= 1.2
+Requires:	xorg-lib-libXtst >= 1.0.99.1
+Requires:	xorg-xserver-server >= 1.12
+%{?requires_xorg_xserver_xinput}
+Obsoletes:	X11-input-synaptics < 0.15
+Obsoletes:	X11-synaptics < 0.15
+Obsoletes:	XFree86-input-synaptics < 0.15
+Obsoletes:	xorg-app-synaptics < 0.15
 ExcludeArch:	sparc sparc64
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -44,21 +58,26 @@ Plik nagłówkowy sterownika synaptics.
 
 %prep
 %setup -q -n xf86-input-synaptics-%{version}
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%configure
+%{__libtoolize}
+%{__aclocal}
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-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
 
 %clean
@@ -66,17 +85,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc COPYING ChangeLog README TODO
+%doc COPYING ChangeLog README.md
 %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
+%{_datadir}/X11/xorg.conf.d/70-synaptics.conf
 %{_mandir}/man1/synclient.1*
 %{_mandir}/man1/syndaemon.1*
 %{_mandir}/man4/synaptics.4*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/xorg/synaptics*.h
+%{_includedir}/xorg/synaptics.h
+%{_includedir}/xorg/synaptics-properties.h
 %{_pkgconfigdir}/xorg-synaptics.pc