rpms/xorg-x11-drv-synaptics/F-12 .cvsignore, 1.19, 1.20 sources, 1.19, 1.20 xorg-x11-drv-synaptics.spec, 1.38, 1.39 synaptics-1.2.0-timer-fix.patch, 1.1, NONE

[Peter Hutterer]

Author: whot

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

Modified Files:
	.cvsignore sources xorg-x11-drv-synaptics.spec 
Removed Files:
	synaptics-1.2.0-timer-fix.patch 
Log Message:
* Mon Dec 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-1
- synaptics 1.2.1
- synaptics-1.2.0-timer-fix.patch: Drop, upstreamed.



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	9 Oct 2009 00:14:52 -0000	1.19
+++ .cvsignore	14 Dec 2009 21:56:04 -0000	1.20
@@ -1 +1 @@
-xf86-input-synaptics-1.2.0.tar.bz2
+xf86-input-synaptics-1.2.1.tar.bz2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/sources,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- sources	9 Oct 2009 00:14:52 -0000	1.19
+++ sources	14 Dec 2009 21:56:04 -0000	1.20
@@ -1 +1 @@
-2cf0a2b0b3006bcfcd85bb77d966244a  xf86-input-synaptics-1.2.0.tar.bz2
+29a6f9da5123149e4abc8ff83880ed5c  xf86-input-synaptics-1.2.1.tar.bz2


Index: xorg-x11-drv-synaptics.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-synaptics/F-12/xorg-x11-drv-synaptics.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- xorg-x11-drv-synaptics.spec	9 Dec 2009 17:43:39 -0000	1.38
+++ xorg-x11-drv-synaptics.spec	14 Dec 2009 21:56:04 -0000	1.39
@@ -6,8 +6,8 @@
 
 Name:           xorg-x11-drv-synaptics
 Summary:        Xorg X11 Synaptics touchpad input driver
-Version:        1.2.0
-Release:        3%{?dist}
+Version:        1.2.1
+Release:        1%{?dist}
 URL:            http://www.x.org
 License:        MIT
 Group:          User Interface/X Hardware Support
@@ -18,8 +18,6 @@ Source0:        ftp://ftp.x.org/pub/indi
 Source1:        10-synaptics.fdi
 Source2:        make-git-snapshot.sh
 
-Patch0:		synaptics-1.2.0-timer-fix.patch
-
 ExcludeArch:    s390 s390x
 
 BuildRequires:  libtool pkgconfig
@@ -76,7 +74,6 @@ Features:
 %prep
 %setup -q -n %{tarball}-%{version}
 #%setup -q -n %{tarball}-%{gitdate}
-%patch0 -p1 -b .timer-fix
 
 %build
 autoreconf -v --install --force || exit 1
@@ -125,6 +122,10 @@ Development files for the Synaptics Touc
 
 
 %changelog
+* Mon Dec 14 2009 Peter Hutterer <peter.hutterer at redhat.com> 1.2.1-1
+- synaptics 1.2.1
+- synaptics-1.2.0-timer-fix.patch: Drop, upstreamed.
+
 * Wed Dec 09 2009 Adam Jackson <ajax at redhat.com> 1.2.0-3
 - synaptics-1.2.0-timer-fix.patch: Don't free the timer in DeviceClose, since
   that gets called on VT switch. (#540248)


--- synaptics-1.2.0-timer-fix.patch DELETED ---