rpms/xorg-x11-drv-synaptics/devel 50-synaptics.conf, NONE, 1.1 xorg-x11-drv-synaptics.spec, 1.45, 1.46 10-synaptics.conf, 1.2, NONE

[Peter Hutterer]

Author: whot

Update of /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6664

Modified Files:
	xorg-x11-drv-synaptics.spec 
Added Files:
	50-synaptics.conf 
Removed Files:
	10-synaptics.conf 
Log Message:
* Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.2-3
- Install config snippet in $datadir/X11/xorg.conf.d.
- Rename to 50-synaptics.conf to match upstream better.



--- NEW FILE 50-synaptics.conf ---
Section "InputClass"
        Identifier "touchpad catchall"
        Driver "synaptics"
        MatchIsTouchpad "on"
        MatchDevicePath "/dev/input/event*"
EndSection


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.45
retrieving revision 1.46
diff -u -p -r1.45 -r1.46
--- xorg-x11-drv-synaptics.spec	13 Apr 2010 22:48:40 -0000	1.45
+++ xorg-x11-drv-synaptics.spec	15 Apr 2010 06:57:34 -0000	1.46
@@ -1,13 +1,13 @@
-%global tarball xf86-input-synaptics
-%global moduledir %(pkg-config xorg-server --variable=moduledir )
-%global driverdir %{moduledir}/input
+%define tarball xf86-input-synaptics
+%define moduledir %(pkg-config xorg-server --variable=moduledir )
+%define driverdir %{moduledir}/input
 
-#global gitdate 20090907
+#define gitdate 20090907
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
 Version:        1.2.2
-Release:        2%{?dist}
+Release:        3%{?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.conf
+Source1:        50-synaptics.conf
 Source2:        make-git-snapshot.sh
 
 ExcludeArch:    s390 s390x
@@ -25,7 +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.7.99.901
+Requires:       xorg-x11-server-Xorg >= 1.8.0-6
 
 Provides:       synaptics = %{version}-%{release}
 Obsoletes:      synaptics < 0.15.0
@@ -87,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%{_sysconfdir}/xorg.conf.d
-install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/xorg.conf.d/10-synaptics.conf
+install -d $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d
+install -m 0644 %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%{_sysconfdir}/xorg.conf.d/10-synaptics.conf
+%{_datadir}/X11/xorg.conf.d/50-synaptics.conf
 %{driverdir}/synaptics_drv.so
 %{_bindir}/synclient
 %{_bindir}/syndaemon
@@ -120,14 +120,18 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Thu Apr 15 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.2-3
+- Install config snippet in $datadir/X11/xorg.conf.d.
+- Rename to 50-synaptics.conf to match upstream better.
+
 * Wed Apr 14 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.2-2
 - Only match /dev/input/event* in 10-synaptics.conf. (related #581573)
 
 * Fri Mar 26 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.2-1
 - synaptics 1.2.2
 
-* Fri Feb 19 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-4
-- Replace defines with globals in spec file.
+* Thu Mar 11 2010 Adam Jackson <ajax at redhat.com> 1.2.1-4
+- synaptics-1.2.1-timer-fix.patch: Don't clobber the timer we just created.
 
 * Tue Feb 16 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-3
 - cvs add 10-synaptics.conf this time


--- 10-synaptics.conf DELETED ---