update to 1.2.2

drop hal support, add xorg.conf snippet


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@707 ec354946-7b23-47d6-9f5a-488ba84defc7

x/xorg-x11-drv-synaptics/xorg-x11-drv-synaptics-vl.spec

@@ -5,14 +5,16 @@
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 synaptics input driver
 Summary(ja):    Xorg X11 synaptics 入力ドライバ
-Version:        1.2.1
-Release:        3%{?_dist_release}
+Version:        1.2.2
+Release:        1%{?_dist_release}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 
+Source1:	10-synaptics.conf
+
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 ExcludeArch:    s390 s390x
 BuildRequires:  libtool, pkgconfig
@@ -20,7 +22,6 @@ BuildRequires:  xorg-x11-server-sdk >= 1.6.0
 BuildRequires:  libX11-devel, libXi-devel, libXext-devel
 BuildRequires:  xorg-x11-util-macros >= 1.3.0
 Requires:       xorg-x11-server-Xorg
-Requires:       hal
 
 Provides:       synaptics = %{version}-%{release}
 Obsoletes:      synaptics < 0.15.0
@@ -96,8 +97,12 @@ 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/10osvendor
-install -m644 fdi/11-x11-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
+# install xorg.conf snippet
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
+install -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/
+
+#install -d $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
+#install -m644 fdi/11-x11-synaptics.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi/policy/10osvendor
 
 
 %clean
@@ -106,7 +111,8 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(-,root,root,-)
 %doc COPYING README
-%{_datadir}/hal/fdi/policy/10osvendor/*
+#%{_datadir}/hal/fdi/policy/10osvendor/*
+%{_sysconfdir}/xorg.conf.d/*.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
 %{_bindir}/syndaemon
@@ -118,6 +124,13 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/xorg-synaptics.pc
 
 %changelog
+* Mon Mar 29 2010 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.2-1
+- update to 1.2.2
+- drop hal support
+  - drop hal fdi policy
+  - remove R: hal
+- add xorg.conf snippet
+
 * Sun Mar 28 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.2.1-3
 - rebuild with xserver-1.8rc (x86_64)