From 00d211e9aed4b81c42f9c692a20be3ae97d0b563 Mon Sep 17 00:00:00 2001
From: Bastien Nocera <hadess@fedoraproject.org>
Date: Mon, 15 Feb 2010 10:04:16 +0000
Subject: [PATCH] - Update to 4.61 - Remove Wacom tablet enabler, now in the
 kernel

---
 .cvsignore                       |  2 +-
 bluez-activate-wacom-mode2.patch | 24 ------------------------
 bluez.spec                       | 11 ++++++-----
 sources                          |  2 +-
 4 files changed, 8 insertions(+), 31 deletions(-)
 delete mode 100644 bluez-activate-wacom-mode2.patch

diff --git a/.cvsignore b/.cvsignore
index 1214a3e..ef56b57 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-bluez-4.60.tar.gz
+bluez-4.61.tar.gz
diff --git a/bluez-activate-wacom-mode2.patch b/bluez-activate-wacom-mode2.patch
deleted file mode 100644
index 4623123..0000000
--- a/bluez-activate-wacom-mode2.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/input/device.c b/input/device.c
-index 0090bd4..8d65148 100644
---- a/input/device.c
-+++ b/input/device.c
-@@ -658,6 +658,19 @@ static int hidp_add_connection(const struct input_device *idev,
- 		err = write(sk, buf, sizeof(buf));
- 	}
- 
-+	if (req->vendor == 0x056a && req->product == 0x81) {
-+		unsigned char buf[3];
-+		int sk = g_io_channel_unix_get_fd(iconn->ctrl_io);
-+
-+		buf[0] = 0x53; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
-+		buf[1] = 0x03; buf[2] = 0x00;
-+		write(sk, buf, sizeof(buf));
-+
-+		buf[0] = 0x71; /* HIDP_TRANS_SET_REPORT | HIDP_DATA_RTYPE_FEATURE */
-+		/* 0x06 - high reporting speed, 0x05 - low speed */
-+		buf[1] = 0x06; buf[2] = 0x00;
-+		write(sk, buf, sizeof(buf));
-+	}
- 	err = ioctl_connadd(req);
- 
- cleanup:
diff --git a/bluez.spec b/bluez.spec
index cb3a431..ad878b8 100644
--- a/bluez.spec
+++ b/bluez.spec
@@ -1,7 +1,7 @@
 Summary: Bluetooth utilities
 Name: bluez
-Version: 4.60
-Release: 2%{?dist}
+Version: 4.61
+Release: 1%{?dist}
 License: GPLv2+
 Group: Applications/System
 Source: http://www.kernel.org/pub/linux/bluetooth/%{name}-%{version}.tar.gz
@@ -17,8 +17,6 @@ Patch1: bluez-utils-oui-usage.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=450081
 # http://thread.gmane.org/gmane.linux.bluez.kernel/1687
 Patch2: bluez-try-utf8-harder.patch
-# http://thread.gmane.org/gmane.linux.bluez.kernel/1754
-Patch3: bluez-activate-wacom-mode2.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=498756
 Patch4: bluez-socket-mobile-cf-connection-kit.patch
 # http://thread.gmane.org/gmane.linux.bluez.kernel/2396
@@ -130,7 +128,6 @@ This includes hidd, dund and pand.
 %setup -q
 %patch1 -p0 -b .oui
 %patch2 -p1 -b .non-utf8-name
-%patch3 -p1 -b .wacom
 %patch4 -p1 -b .socket-mobile
 %patch5 -p1 -b .cable-pairing
 
@@ -273,6 +270,10 @@ fi
 %config(noreplace) %{_sysconfdir}/sysconfig/pand
 
 %changelog
+* Mon Feb 15 2010 Bastien Nocera <bnocera@redhat.com> 4.61-1
+- Update to 4.61
+- Remove Wacom tablet enabler, now in the kernel
+
 * Mon Feb 15 2010 Bastien Nocera <bnocera@redhat.com> 4.60-2
 - Fix typo in init script (#558993)
 
diff --git a/sources b/sources
index b41da18..57f3151 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-38511ddd2110f14b72a1e870724a3091  bluez-4.60.tar.gz
+fb01ec1469feea654f3f9f598f47cc2d  bluez-4.61.tar.gz