rpms/xorg-x11-drv-synaptics/devel xorg-x11-drv-synaptics.spec, 1.40, 1.41 10-synaptics.fdi, 1.7, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20090

Modified Files:
	xorg-x11-drv-synaptics.spec 
Removed Files:
	10-synaptics.fdi 
Log Message:
* Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-2
- 10-synaptics.conf: new xorg.conf.d config file, replacing the fdi.
- 10-synaptics.fdi: drop, X server doesn't use HAL anymore.
- Drop HAL require



Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -p -r1.40 -r1.41
--- xorg-x11-drv-synaptics.spec	13 Feb 2010 01:33:44 -0000	1.40
+++ xorg-x11-drv-synaptics.spec	16 Feb 2010 06:00:22 -0000	1.41
@@ -7,7 +7,7 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -15,7 +15,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{ve
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 #Source0:        %{tarball}-%{gitdate}.tar.bz2
-Source1:        10-synaptics.fdi
+Source1:        10-synaptics.conf
 Source2:        make-git-snapshot.sh
 
 ExcludeArch:    s390 s390x
@@ -25,8 +25,7 @@ BuildRequires:  xorg-x11-server-sdk >= 1
 BuildRequires:  libX11-devel libXi-devel
 BuildRequires:  xorg-x11-util-macros >= 1.3.0
 
-Requires:       xorg-x11-server-Xorg >= 1.6.0-2
-Requires:       hal
+Requires:       xorg-x11-server-Xorg >= 1.7.99.901
 
 Provides:       synaptics = %{version}-%{release}
 Obsoletes:      synaptics < 0.15.0
@@ -43,7 +42,6 @@ touchpad models are supported:
 
 Note that support for appletouch, elantech and bcm5974 requires the respective
 kernel module.
-
 A touchpad by default operates in compatibility mode by emulating a standard
 mouse. However, by using a dedicated driver, more advanced features of the
 touchpad become available.
@@ -89,15 +87,15 @@ make install DESTDIR=$RPM_BUILD_ROOT
 # should be fixed in upstream Makefile.am or whatever.
 find $RPM_BUILD_ROOT -regex ".*\.la$" | xargs rm -f --
 
-install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/20thirdparty
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/10-synaptics.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_datadir}/hal/fdi/policy/20thirdparty/10-synaptics.fdi
+%{_sysconfdir}/xorg.conf.d/10-synaptics.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
 %{_bindir}/syndaemon
@@ -122,6 +120,11 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-2
+- 10-synaptics.conf: new xorg.conf.d config file, replacing the fdi.
+- 10-synaptics.fdi: drop, X server doesn't use HAL anymore.
+- Drop HAL require
+
 * Sat Feb 13 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-1
 - synaptics 1.2.1
 


--- 10-synaptics.fdi DELETED ---