From 5a70b24264e79f1273c7b3dd837889f6aeacd96e Mon Sep 17 00:00:00 2001
From: Peter Hutterer <whot@fedoraproject.org>
Date: Thu, 7 May 2009 03:51:23 +0000
Subject: [PATCH] - evdev 2.2.2

---
 .cvsignore                      |  2 +-
 evdev-2.2.1-read-deadlock.patch | 29 -----------------------------
 sources                         |  2 +-
 xorg-x11-drv-evdev.spec         | 12 +++++-------
 4 files changed, 7 insertions(+), 38 deletions(-)
 delete mode 100644 evdev-2.2.1-read-deadlock.patch

diff --git a/.cvsignore b/.cvsignore
index f53f8b5..5bfdc02 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-xf86-input-evdev-2.2.1.tar.bz2
+xf86-input-evdev-2.2.2.tar.bz2
diff --git a/evdev-2.2.1-read-deadlock.patch b/evdev-2.2.1-read-deadlock.patch
deleted file mode 100644
index 9af7327..0000000
--- a/evdev-2.2.1-read-deadlock.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 98ecb5233bb3b899bd696a90d2733c6a345676dd Mon Sep 17 00:00:00 2001
-From: Peter Hutterer <peter.hutterer@who-t.net>
-Date: Mon, 6 Apr 2009 10:22:25 +1000
-Subject: [PATCH] Trigger read error handling if len is <= 0.
-
-Red Hat Bug 494245 <https://bugzilla.redhat.com/show_bug.cgi?id=494245>
-
-Reported-by: David Woodhouse <dwmw2@infradead.org>
-Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
----
- src/evdev.c |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/src/evdev.c b/src/evdev.c
-index f65359f..43a90be 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -565,7 +565,7 @@ EvdevReadInput(InputInfoPtr pInfo)
-     while (len == sizeof(ev))
-     {
-         len = read(pInfo->fd, &ev, sizeof(ev));
--        if (len == 0)
-+        if (len <= 0)
-         {
-             if (errno == ENODEV) /* May happen after resume */
-             {
--- 
-1.6.0.6
-
diff --git a/sources b/sources
index 3caecc5..b205528 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ed0ec2f11a2fc94355d083a03e2f9844  xf86-input-evdev-2.2.1.tar.bz2
+23341f098e7fe8ec13ef06ef784ac51a  xf86-input-evdev-2.2.2.tar.bz2
diff --git a/xorg-x11-drv-evdev.spec b/xorg-x11-drv-evdev.spec
index 130911c..f2e5f82 100644
--- a/xorg-x11-drv-evdev.spec
+++ b/xorg-x11-drv-evdev.spec
@@ -6,8 +6,8 @@
 
 Summary:    Xorg X11 evdev input driver
 Name:	    xorg-x11-drv-evdev
-Version:    2.2.1
-Release:    2%{?dist}
+Version:    2.2.2
+Release:    1%{?dist}
 URL:	    http://www.x.org
 License:    MIT
 Group:	    User Interface/X Hardware Support
@@ -17,8 +17,6 @@ Source0:   ftp://ftp.x.org/pub/individual/driver/%{tarball}-%{version}.tar.bz2
 #Source0:    %{tarball}-%{gitdate}.tar.bz2
 #Source1:    make-git-snapshot.sh
 
-Patch1:     evdev-2.2.1-read-deadlock.patch
-
 ExcludeArch: s390 s390x
 
 BuildRequires: autoconf automake libtool
@@ -35,9 +33,6 @@ X.Org X11 evdev input driver.
 #%setup -q -n %{tarball}-%{gitdate}
 %setup -q -n %{tarball}-%{version}
 
-# apply patches
-%patch1 -p1 -b .read-deadlock
-
 %build
 autoreconf -v --install || exit 1
 %configure --disable-static
@@ -75,6 +70,9 @@ X.Org X11 evdev input driver development files.
 
 
 %changelog
+* Thu May 07 2009 Peter Hutterer <peter.hutterer@redhat.com> 2.2.2-1
+- evdev 2.2.2
+
 * Mon Apr 06 2009 Peter Hutterer <peter.hutterer@redhat.com> 2.2.1-2
 - evdev-2.2.1-read-deadlock.patch: handle read errors on len <= 0 (#494245)