rpms/xorg-x11-drv-synaptics/devel .cvsignore, 1.21, 1.22 sources, 1.21, 1.22 xorg-x11-drv-synaptics.spec, 1.50, 1.51

[Peter Hutterer]

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Log Message:
* Tue Jun 01 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-1
- Update to today's git version. Includes the new pointer acceleration code.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/.cvsignore,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- .cvsignore	26 Mar 2010 05:31:30 -0000	1.21
+++ .cvsignore	1 Jun 2010 00:48:30 -0000	1.22
@@ -1 +1 @@
-xf86-input-synaptics-1.2.2.tar.bz2
+xf86-input-synaptics-20100601.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/devel/sources,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -p -r1.21 -r1.22
--- sources	26 Mar 2010 05:31:30 -0000	1.21
+++ sources	1 Jun 2010 00:48:30 -0000	1.22
@@ -1 +1 @@
-d8842f762bf3f20098c529136dac578c  xf86-input-synaptics-1.2.2.tar.bz2
+1d984b2ccf2774323b176f60046bdd95  xf86-input-synaptics-20100601.tar.bz2


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.50
retrieving revision 1.51
diff -u -p -r1.50 -r1.51
--- xorg-x11-drv-synaptics.spec	18 May 2010 00:12:26 -0000	1.50
+++ xorg-x11-drv-synaptics.spec	1 Jun 2010 00:48:31 -0000	1.51
@@ -2,32 +2,32 @@
 %define moduledir %(pkg-config xorg-server --variable=moduledir )
 %define driverdir %{moduledir}/input
 
-#define gitdate 20090907
+%define gitdate 20100601
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.2.2
-Release:        6%{?dist}
+Version:        1.2.99
+Release:        1%{?gitdate:.%{gitdate}}%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+%if 0%{?gitdate}
+Source0:        %{tarball}-%{gitdate}.tar.bz2
+%else
 Source0:        ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
-#Source0:        %{tarball}-%{gitdate}.tar.bz2
+%endif
 Source1:        50-synaptics.conf
 Source2:        make-git-snapshot.sh
 Source3:        70-touchpad-quirks.rules
 
-Patch01:        synaptics-1.2.2-clickfinger-defaults.patch
-Patch02:        synaptics-1.2.2-clickpad-support.patch
-
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
 BuildRequires:  xorg-x11-server-sdk >= 1.6.0-2
 BuildRequires:  libX11-devel libXi-devel
-BuildRequires:  xorg-x11-util-macros >= 1.3.0
+BuildRequires:  xorg-x11-util-macros >= 1.8.0
 
 Requires:       xorg-x11-server-Xorg >= 1.8.0-6
 Requires:       udev
@@ -75,11 +75,7 @@ Features:
       parameter settings without restarting the X server.
 
 %prep
-%setup -q -n %{tarball}-%{version}
-#%setup -q -n %{tarball}-%{gitdate}
-
-%patch01 -p1
-%patch02 -p1
+%setup -q -n %{tarball}-%{?gitdate:%{gitdate}}%{!?gitdate:%{version}}
 
 %build
 autoreconf -v --install --force || exit 1
@@ -133,6 +129,9 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Tue Jun 01 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.99-1
+- Update to today's git version. Includes the new pointer acceleration code.
+
 * Tue May 18 2010 Peter Hutterer <peter.hutterer at redhat.com> 1.2.2-6
 - The rules file shouldn't end in .conf...