[colord/f16] Fix the ColorHug driver to not time out on dark reads with firmware versions >= 1.1.2

[Richard Hughes]

commit 3fbaef557f2f06508539620e323d445d2a8cedcf
Author: Richard Hughes <richard at hughsie.com>
Date:   Wed Jan 25 15:56:04 2012 +0000

    Fix the ColorHug driver to not time out on dark reads with firmware
    versions >= 1.1.2

 ...rhug-Bump-the-sample-timeout-to-5-seconds.patch |   25 ++++++++++++++++++++
 colord.spec                                        |   15 +++++++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/0001-colorhug-Bump-the-sample-timeout-to-5-seconds.patch b/0001-colorhug-Bump-the-sample-timeout-to-5-seconds.patch
new file mode 100644
index 0000000..1182e13
--- /dev/null
+++ b/0001-colorhug-Bump-the-sample-timeout-to-5-seconds.patch
@@ -0,0 +1,25 @@
+From e094541696f806356f7ddd4dc4114423d02e9b53 Mon Sep 17 00:00:00 2001
+From: Richard Hughes <richard at hughsie.com>
+Date: Mon, 23 Jan 2012 18:13:55 +0000
+Subject: [PATCH] colorhug: Bump the sample timeout to 5 seconds
+
+---
+ src/sensors/cd-sensor-colorhug-private.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/sensors/cd-sensor-colorhug-private.c b/src/sensors/cd-sensor-colorhug-private.c
+index 01ec8ca..8f15238 100644
+--- a/src/sensors/cd-sensor-colorhug-private.c
++++ b/src/sensors/cd-sensor-colorhug-private.c
+@@ -214,7 +214,7 @@ ch_print_data_buffer (const gchar *title,
+ }
+ 
+ /* the default timeout */
+-#define CH_DEVICE_USB_TIMEOUT	2000
++#define CH_DEVICE_USB_TIMEOUT	5000
+ 
+ typedef struct {
+ 	GUsbDevice		*device;
+-- 
+1.7.7.5
+
diff --git a/colord.spec b/colord.spec
index 521217c..4a70b7c 100644
--- a/colord.spec
+++ b/colord.spec
@@ -1,11 +1,19 @@
 Summary:   Color daemon
 Name:      colord
 Version:   0.1.15
-Release:   1%{?dist}
+
+# BIG FAT WARNING:
+# Don't update to 0.1.16 before selinux policy >= 3.10.0-73 is available
+# in the F16 updates-testing repo
+
+Release:   2%{?dist}
 License:   GPLv2+ and LGPLv2+
 URL:       http://www.freedesktop.org/software/colord/
 Source0:   http://www.freedesktop.org/software/colord/releases/%{name}-%{version}.tar.xz
 
+# already upstream...
+Patch0:    0001-colorhug-Bump-the-sample-timeout-to-5-seconds.patch
+
 BuildRequires: dbus-devel
 BuildRequires: docbook-utils
 BuildRequires: gettext
@@ -37,6 +45,7 @@ Files for development with %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .fix-colorhug
 
 %build
 %configure \
@@ -93,6 +102,10 @@ touch $RPM_BUILD_ROOT%{_localstatedir}/lib/colord/storage.db
 %{_datadir}/vala/vapi/*.vapi
 
 %changelog
+* Wed Jan 25 2012 Richard Hughes <richard at hughsie.com> 0.1.15-2
+- Fix the ColorHug driver to not time out on dark reads with firmware
+  versions >= 1.1.2
+
 * Sat Nov 26 2011 Richard Hughes <richard at hughsie.com> 0.1.15-1
 - New upstream version
 - This release fixes an important security bug: CVE-2011-4349.