rpms/xorg-x11-drv-evdev/F-12 xorg-x11-drv-evdev.spec,1.67,1.68

[Peter Hutterer]

Author: whot

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

Modified Files:
	xorg-x11-drv-evdev.spec 
Log Message:
* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.1-2
- 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
  drop, merged upstream.



Index: xorg-x11-drv-evdev.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xorg-x11-drv-evdev/F-12/xorg-x11-drv-evdev.spec,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -p -r1.67 -r1.68
--- xorg-x11-drv-evdev.spec	20 Nov 2009 01:42:59 -0000	1.67
+++ xorg-x11-drv-evdev.spec	20 Nov 2009 01:50:14 -0000	1.68
@@ -7,7 +7,7 @@
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
 Version:    2.3.1
-Release:    1%{?dist}
+Release:    2%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -18,9 +18,6 @@ Source0:   ftp://ftp.x.org/pub/individua
 Source1:    make-git-snapshot.sh
 Source2:    commitid
 
-# Already upstream
-Patch1:     0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -38,8 +35,6 @@ X.Org X11 evdev input driver.
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
-%patch1 -p1
-
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
@@ -77,6 +72,10 @@ X.Org X11 evdev input driver development
 
 
 %changelog
+* Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.1-2
+- 0001-Fix-drag-lock-property-handler-for-multiple-draglock.patch
+  drop, merged upstream.
+
 * Fri Nov 20 2009 Peter Hutterer <peter.hutterer at redhat.com> 2.3.1-1
 - evdev 2.3.1