X-Git-Url: https://git.pld-linux.org/?a=blobdiff_plain;f=xorg-driver-input-synaptics.spec;h=aa637c8dcc580c175902350aecc9058d65b21603;hb=f9ab50798b8fb2bd360e3e018043b67f28eb3888;hp=863a5921b8e477fbe553a174f6777375496b4bb5;hpb=bbfad80fd1dd8cc2c88803fb5444158b85d17686;p=packages%2Fxorg-driver-input-synaptics.git

diff --git a/xorg-driver-input-synaptics.spec b/xorg-driver-input-synaptics.spec
index 863a592..aa637c8 100644
--- a/xorg-driver-input-synaptics.spec
+++ b/xorg-driver-input-synaptics.spec
@@ -1,21 +1,25 @@
 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.1.99.1
+Version:	1.4.0
 Release:	1
 License:	MIT
 Group:		X11/Applications
 Source0:	http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-%{version}.tar.bz2
-# Source0-md5:	c2019c143cea8fc8f991b8b166f6c48b
+# Source0-md5:	cbe487f9d22237d1e39c7d0b5812ab7e
 URL:		http://xorg.freedesktop.org/
 BuildRequires:	perl-base
 BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.389
-BuildRequires:	xorg-lib-libX11-devel
-BuildRequires:	xorg-lib-libXext-devel
-BuildRequires:	xorg-lib-libpciaccess-devel
-BuildRequires:	xorg-xserver-server-devel
-%requires_xorg_xserver_xinput
+BuildRequires:	xorg-lib-libXi-devel >= 1.2
+BuildRequires:	xorg-lib-libXtst-devel >= 1.0.99.1
+BuildRequires:	xorg-proto-inputproto-devel
+BuildRequires:	xorg-util-util-macros >= 1.8
+BuildRequires:	xorg-xserver-server-devel >= 1.6
+Requires:	xorg-lib-libXi >= 1.2
+Requires:	xorg-lib-libXtst >= 1.0.99.1
+Requires:	xorg-xserver-server >= 1.6
+%{?requires_xorg_xserver_xinput}
 Obsoletes:	X11-input-synaptics
 Obsoletes:	X11-synaptics
 Obsoletes:	XFree86-input-synaptics
@@ -44,18 +48,16 @@ Plik nagłówkowy sterownika synaptics.
 %setup -q -n xf86-input-synaptics-%{version}
 
 %build
-%configure
+%configure \
+	--disable-silent-rules
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_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
-
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/xorg/modules/input/*.la
 
 %clean
@@ -63,16 +65,17 @@ 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
-%{_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*
 
 %files devel
 %defattr(644,root,root,755)
-%{_includedir}/xorg/synaptics*.h
+%{_includedir}/xorg/synaptics.h
+%{_includedir}/xorg/synaptics-properties.h
 %{_pkgconfigdir}/xorg-synaptics.pc